From 6314b86d9b286494fc47d0a8acaf07da66fb43d7 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 11 Aug 2022 20:23:19 +0200
Subject: [PATCH] Better fix for #13382

---
 lib/mqtt.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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