diff --git a/src/servers/registrar/mime/RegistrarThreadManager.cpp b/src/servers/registrar/mime/RegistrarThreadManager.cpp
index 504c75fc3e..9ce7690a5e 100644
--- a/src/servers/registrar/mime/RegistrarThreadManager.cpp
+++ b/src/servers/registrar/mime/RegistrarThreadManager.cpp
@@ -243,6 +243,9 @@ RegistrarThreadManager::ThreadCount() const
 std::list<RegistrarThread*>::iterator&
 RegistrarThreadManager::RemoveThread(std::list<RegistrarThread*>::iterator &i)
 {
+	status_t dummy;
+	wait_for_thread((*i)->Id(), &dummy);
+
 	delete *i;
 	atomic_add(&fThreadCount, -1);
 	return (i = fThreads.erase(i));