diff --git a/server/controlSession.cpp b/server/controlSession.cpp
index cabebea6..43896633 100644
--- a/server/controlSession.cpp
+++ b/server/controlSession.cpp
@@ -70,6 +70,7 @@ void ControlSession::stop()
 		if (writerThread_)
 		{
 			logD << "joining writerThread\n";
+			messages_.abort_wait();
 			writerThread_->join();
 			delete writerThread_;
 		}