diff --git a/src/comm/TCPLink.cc b/src/comm/TCPLink.cc
index d540f644496f86160585f1a941f531f695f8fa77..384c90a778857b6b6a1226e2f4b25f6615d2192b 100644
--- a/src/comm/TCPLink.cc
+++ b/src/comm/TCPLink.cc
@@ -119,6 +119,8 @@ void TCPLink::_disconnect(void)
     if (_socket) {
         _socketIsConnected = false;
         _socket->deleteLater(); // Make sure delete happens on correct thread
+        _socket->disconnectFromHost(); // Disconnect tcp
+        _socket->waitForDisconnected();        
         _socket = NULL;
         emit disconnected();
     }