diff --git a/src/channel.c b/src/channel.c
index 9d1d7fe..7a6bc93 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -335,8 +335,8 @@ void channel_override_set(int idx) {
   }
   if (s_channels[idx].channel_override && (match == s_channels[idx].relay_state)) {
     LOG(LL_INFO, ("User state agrees with timespec, clearing override"));
-    mqtt_publish_stat("override", "{idx: %d, relay_state: %d, override: %B}", idx, s_channels[idx].relay_state, s_channels[idx].channel_override);
     s_channels[idx].channel_override = false;
+    mqtt_publish_stat("override", "{idx: %d, relay_state: %d, override: %B}", idx, s_channels[idx].relay_state, s_channels[idx].channel_override);
     return;
   }
 }
@@ -348,8 +348,8 @@ void channel_override_clear(int idx) {
   }
 
   if (s_channels[idx].channel_override) {
-    mqtt_publish_stat("override", "{idx: %d, relay_state: %d, override: %B}", idx, s_channels[idx].relay_state, s_channels[idx].channel_override);
     s_channels[idx].channel_override = false;
+    mqtt_publish_stat("override", "{idx: %d, relay_state: %d, override: %B}", idx, s_channels[idx].relay_state, s_channels[idx].channel_override);
   }
   return;
 }