diff --git a/src/Components/Modules/BitMessage.cpp b/src/Components/Modules/BitMessage.cpp
index 27c2df44..a36e8cd1 100644
--- a/src/Components/Modules/BitMessage.cpp
+++ b/src/Components/Modules/BitMessage.cpp
@@ -187,15 +187,7 @@ namespace Components
 	{
 		BitMessage::Save();
 
-		// We have to do that in another thread, as sometimes the terminating thread already holds the mutex lock...
-#ifndef DEBUG
-		std::thread([&] ()
-		{
-#endif
-			delete BitMessage::BMClient;
-#ifndef DEBUG
-		}).join();
-#endif
+		delete BitMessage::BMClient;
 
 		BitMessage::BMClient = nullptr;
 	}