diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index ad68ba5bf..84755b54d 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -404,6 +404,7 @@ void SwitchHandler(uint32_t mode) {
           }
           break;
         case PUSH_IGNORE:
+          Switch.last_state[i] = button;                        // Update switch state before publishing
           MqttPublishSensor();
           break;
         }