diff --git a/sonoff/xsns_29_mcp230xx.ino b/sonoff/xsns_29_mcp230xx.ino
index 1fdb8a863..faf193d42 100644
--- a/sonoff/xsns_29_mcp230xx.ino
+++ b/sonoff/xsns_29_mcp230xx.ino
@@ -443,7 +443,9 @@ boolean Xsns29(byte function)
         MCP230xx_Show(1);
         break;
       case FUNC_COMMAND:
-        result = MCP230xx_Command();
+        if (XSNS_29 == XdrvMailbox.index) {
+          result = MCP230xx_Command();
+        }
         break;        
 #ifdef USE_WEBSERVER
 #ifdef USE_MCP230xx_displaymain