diff --git a/src/open9x.cpp b/src/open9x.cpp
index 4aac9a1bc..4b4856062 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -618,7 +618,8 @@ int8_t getMovedSwitch()
     }
     bool next = __getSwitch(i);
     if (prev != next) {
-      result = i;
+      if (i!=MAX_PSWITCH || next==true)
+        result = i;
       if (mask)
         switches_states ^= mask;
       else