diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
index 3c3be091ca1e7..db14e51bd151f 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
@@ -201,6 +201,7 @@ public void initialize() {
 
     @Override
     public void dispose() {
+        discoveryHomeAssistantIDs.clear();
         removeStateDescriptions();
         // super.dispose() calls stop()
         super.dispose();
@@ -251,7 +252,6 @@ protected void stop() {
             haComponentsByUniqueId.clear();
             haComponentsByHaId.clear();
             channelStates.clear();
-            discoveryHomeAssistantIDs.clear();
             updateComponent = null;
             started = false;
         }