diff --git a/docs/use/rf.md b/docs/use/rf.md
index e14e588dc3..30229a2731 100644
--- a/docs/use/rf.md
+++ b/docs/use/rf.md
@@ -198,7 +198,10 @@ Generate your RF signals by pressing a remote button or other and you will see :
 #### Enabling RAW packet return support
 First, you need to compile a binary with `Pilight_rawEnabled true` uncommented in config_RF.h.
 
-Once the device is online, you can turn on the RAW packet return support with the following MQTT command:
+Once the device is online and the active receiver is Pilght, you can toggle raw packet return.
+If current active receiver is not Pilight the toggle command will be ignored and harmless error message will be published.
+
+You can turn on the RAW packet return support with the following MQTT command:
 
 `mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoPilight/protocols" -m '{"rawEnabled":true}'`
 
diff --git a/main/ZgatewayPilight.ino b/main/ZgatewayPilight.ino
index b2329d92a3..182885828f 100644
--- a/main/ZgatewayPilight.ino
+++ b/main/ZgatewayPilight.ino
@@ -182,10 +182,12 @@ void XtoPilight(const char* topicOri, JsonObject& Pilightdata) {
     if (Pilightdata.containsKey("rawEnabled")) {
       Log.notice(F("Setting PiLight raw output enabled: %T" CR), (bool)Pilightdata["rawEnabled"]);
       pilightRawEnabled = (bool)Pilightdata["rawEnabled"];
-      disablePilightReceive();
-      delay(1);
-      enablePilightReceive();
-      success = true;
+      if (currentReceiver == ACTIVE_PILIGHT) {
+        disablePilightReceive();
+        delay(1);
+        enablePilightReceive();
+        success = true;
+      }
     }
 #  endif