diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index c608d764b..95b5d91af 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1675,7 +1675,6 @@ class HomeAssistant extends Extension {
 
         const friendlyName = resolvedEntity.settings.friendlyName;
         this.getConfigs(resolvedEntity).forEach((config) => {
-            const topic = this.getDiscoveryTopic(config, device);
             const payload = {...config.discovery_payload};
             let stateTopic = `${settings.get().mqtt.base_topic}/${friendlyName}`;
             if (payload.state_topic_postfix) {
@@ -1842,6 +1841,7 @@ class HomeAssistant extends Extension {
                 }
             }
 
+            const topic = this.getDiscoveryTopic(config, device);
             this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 0}, this.discoveryTopic);
         });