diff --git a/slsDetectorSoftware/MySocketTCP/genericSocket.h b/slsDetectorSoftware/MySocketTCP/genericSocket.h
index fc5e6e791..af08337a9 100644
--- a/slsDetectorSoftware/MySocketTCP/genericSocket.h
+++ b/slsDetectorSoftware/MySocketTCP/genericSocket.h
@@ -424,8 +424,7 @@ enum communicationProtocol{
 
 
      void ShutDownSocket(){
-    	 if (socketDescriptor != -1)
-    	 	shutdown(socketDescriptor, SHUT_RDWR);
+   		 while(!shutdown(socketDescriptor, SHUT_RDWR));
      };