diff --git a/plejd/PlejdAddon.js b/plejd/PlejdAddon.js
index c2b90e6..d4e94c7 100644
--- a/plejd/PlejdAddon.js
+++ b/plejd/PlejdAddon.js
@@ -55,15 +55,7 @@ class PlejdAddon extends EventEmitter {
       process.on(signal, this.processCleanupFunc);
     });
 
-    // Eagerly send discovery as soon as possible
-    try {
-      logger.verbose('Eagerly sending discovery to Home Assistant.');
-      this.mqttClient.sendDiscoveryToHomeAssistant();
-    } catch (err) {
-      logger.error('Error in eager discovery send', err);
-    }
-
-    // Send discovery again on MQTT connect to ensure Home Assistant receives device info after reconnects or broker restarts.
+    // Send discovery on MQTT connect to ensure Home Assistant receives device info after reconnects or broker restarts.
     this.mqttClient.on(MqttClient.EVENTS.connected, () => {
       try {
         logger.verbose('connected to mqtt.');
@@ -132,6 +124,14 @@ class PlejdAddon extends EventEmitter {
 
     this.mqttClient.init();
 
+    // Eagerly send discovery after MQTT client is initialized
+    try {
+      logger.verbose('Eagerly sending discovery to Home Assistant.');
+      this.mqttClient.sendDiscoveryToHomeAssistant();
+    } catch (err) {
+      logger.error('Error in eager discovery send', err);
+    }
+
     // subscribe to changes from Plejd
     this.plejdDeviceCommunication.on(
       PlejdDeviceCommunication.EVENTS.stateChanged,
diff --git a/plejd/config.json b/plejd/config.json
index e3ff4e4..53ff5b3 100644
--- a/plejd/config.json
+++ b/plejd/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Plejd",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "slug": "plejd",
   "description": "Adds support for the Swedish home automation devices from Plejd.",
   "url": "https://github.com/icanos/hassio-plejd/",