diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 18e0ce6b9..21f4bcd07 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -538,7 +538,7 @@ void ControlThread::sysv_queue_listener()
             perror("msgget");
         }
 
-    while(read_queue)
+    while(read_queue && !stop_)
         {
             if (msgrcv(msqid, &msg, msgrcv_size, 1, 0) != -1)
                 {