diff --git a/src/server.cpp b/src/server.cpp
index 4797965f2..0cbf50294 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -325,6 +325,8 @@ void * EmergeThread::Thread()
 
 	END_DEBUG_EXCEPTION_HANDLER(errorstream)
 
+	log_deregister_thread();
+
 	return NULL;
 }