diff --git a/lib/mqtt.ts b/lib/mqtt.ts
index 97282d28b..d10adeb2f 100644
--- a/lib/mqtt.ts
+++ b/lib/mqtt.ts
@@ -98,10 +98,9 @@ export default class MQTT {
         }, utils.seconds(10));
 
         logger.info('Connected to MQTT server');
+        await this.publishStateOnline();
 
-        if (this.initialConnect) {
-            await this.publishStateOnline();
-        } else {
+        if (!this.initialConnect) {
             this.republishRetainedTimer = setTimeout(() => {
                 // Republish retained messages in case MQTT broker does not persist them.
                 // https://github.com/Koenkk/zigbee2mqtt/issues/9629