diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index a4ecf694e..cf32fb67c 100644
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -2446,33 +2446,33 @@ int slsReceiverTCPIPInterface::enable_gap_pixels() {
 	if (mySock->ReceiveDataOnly(&enable,sizeof(enable)) < 0 )
 		return printSocketReadError();
 
-	if (myDetectorType != EIGER)
-		functionNotImplemented();
+
 
 	// execute action
 #ifdef SLS_RECEIVER_UDP_FUNCTIONS
+	if (receiverBase == NULL)
+		invalidReceiverObject();
 	else {
-		if (receiverBase == NULL)
-			invalidReceiverObject();
-		else {
-			// set
-			if(enable >= 0) {
-				if (mySock->differentClients && lockStatus)
-					receiverlocked();
-				else if (receiverBase->getStatus() != IDLE)
-					receiverNotIdle();
-				else {
+		// set
+		if(enable >= 0) {
+			if (mySock->differentClients && lockStatus)
+				receiverlocked();
+			else if (receiverBase->getStatus() != IDLE)
+				receiverNotIdle();
+			else {
+				if ((myDetectorType != EIGER) && (enable > 0))
+					functionNotImplemented();
+				else
 					receiverBase->setGapPixelsEnable(enable);
-				}
-			}
-			//get
-			retval = receiverBase->getGapPixelsEnable();
-			if(enable >= 0 && retval != enable){
-				ret = FAIL;
-				sprintf(mess,"Could not set gap pixels to %d, returned %d\n",enable,retval);
-				FILE_LOG(logERROR) << "Warning: " << mess;
 			}
 		}
+		//get
+		retval = receiverBase->getGapPixelsEnable();
+		if(enable >= 0 && retval != enable){
+			ret = FAIL;
+			sprintf(mess,"Could not set gap pixels to %d, returned %d\n",enable,retval);
+			FILE_LOG(logERROR) << "Warning: " << mess;
+		}
 	}
 #endif
 #ifdef VERYVERBOSE