diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc
index d02e9290a3abcc13cf5cb128511d0b89ccf1f66c..ecf6fb90c536eb4c15527b8f67e50dd8caccaa11 100644
--- a/src/comm/UDPLink.cc
+++ b/src/comm/UDPLink.cc
@@ -290,7 +290,8 @@ bool UDPLink::disconnect()
 
         if(socket)
 	{
-		delete socket;
+		// Make sure delete happen on correct thread
+		socket->deleteLater();
 		socket = NULL;
 	}