diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino
index 456b6b06..7f476572 100644
--- a/code/espurna/relay.ino
+++ b/code/espurna/relay.ino
@@ -335,13 +335,14 @@ unsigned char relayParsePayload(const char * payload) {
         value = 1;
     } else if (strcmp(p, "toggle") == 0) {
         value = 2;
+    } else if (strcmp(p, "query") == 0) {
+        value = 3;
     } else {
         value = p[0] - '0';
     }
 
-    if (0 <= value && value <=2) return value;
-    return 0x99;
-
+    if (0 <= value && value <=3) return value;
+    return 0xFF;
 }
 //------------------------------------------------------------------------------
 // REST API
diff --git a/code/espurna/web.ino b/code/espurna/web.ino
index b02a640f..34a2e60c 100644
--- a/code/espurna/web.ino
+++ b/code/espurna/web.ino
@@ -143,7 +143,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
             if (data.containsKey("status")) {
 
                 unsigned char value = relayParsePayload(data["status"]);
-                if (value == 0xFF) {
+                if (value == 3) {
 
                     relayWS();