diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index ed5d386a1..20b5492f4 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -436,6 +436,8 @@ typedef struct
 
      void ShutDownSocket(){
    		 while(!shutdown(socketDescriptor, SHUT_RDWR));
+   		 close(socketDescriptor);
+   		 socketDescriptor = -1;
      };
 
 
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index 9f365d4b0..ff275d805 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -1082,6 +1082,7 @@ int UDPStandardImplementation::createUDPSockets(){
 #ifdef VERBOSE
 			cprintf(BG_RED,"Could not create UDP socket on port %d error: %d\n", port[i], iret);
 #endif
+			shutDownUDPSockets();
 			return FAIL;
 		}
 	}