diff --git a/td/telegram/Client.cpp b/td/telegram/Client.cpp
index 2c590ce31..20ba5d806 100644
--- a/td/telegram/Client.cpp
+++ b/td/telegram/Client.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/Td.h"
 #include "td/telegram/TdCallback.h"
+#include "td/telegram/Log.h"
 
 #include "td/actor/actor.h"
 
@@ -20,10 +21,6 @@
 #include "td/utils/port/RwMutex.h"
 #include "td/utils/port/thread.h"
 
-#ifndef _WIN32
-#include "td/utils/death_handler.h"
-#endif
-
 #include <algorithm>
 #include <atomic>
 #include <memory>
@@ -621,7 +618,7 @@ Client &Client::operator=(Client &&other) = default;
 
 ClientManager::ClientManager() : impl_(std::make_unique<Impl>()) {
   #ifndef _WIN32
-    Debug::DeathHandler dh;
+    td::Log::set_disable_death_handler(true);
   #endif
 }