diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index 07f1e30e2..0fad365fe 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -446,7 +446,7 @@ enum communicationProtocol{
     				 close(file_des);
     			 }
     			 else {
-    				 ShutDownSocket();
+    				 while(!shutdown(socketDescriptor, SHUT_RDWR));
     				 close(socketDescriptor);
     				 socketDescriptor=-1;
     			 }