diff --git a/src/control.cc b/src/control.cc
index b5cf231e..c5b93483 100644
--- a/src/control.cc
+++ b/src/control.cc
@@ -140,7 +140,7 @@ Control::handle_shutdown() {
 
   if (!m_shutdownQuick) {
     if (worker_thread->is_active())
-      worker_thread->stop_thread();
+      worker_thread->stop_thread_wait();
 
     torrent::connection_manager()->listen_close();