diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index ac4c069f8a0964a77bca859b1f3ca2bc0fe75478..4ad64ba3149c114eee6a5bcf48ea9399225b465f 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -98,6 +98,7 @@ MockLink::MockLink(MockConfiguration* config) :
 
 MockLink::~MockLink(void)
 {
+    qDebug() << "MockLink destructor";
     _disconnect();
 }
 
@@ -121,7 +122,8 @@ bool MockLink::_disconnect(void)
 {
     if (_connected) {
         _connected = false;
-        exit();
+        quit();
+        wait();
         emit disconnected();
     }