wrap in async_on_unload

home-assistant · Oct 3, 2024 · c7d6613 · c7d6613
1 parent 448c5f3
commit c7d6613
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/homeassistant/components/zha/helpers.py b/homeassistant/components/zha/helpers.py
@@ -509,9 +509,11 @@ def __init__(
         self._unsubs: list[Callable[[], None]] = []
         self._unsubs.append(self.gateway.on_all_events(self._handle_event_protocol))
         self._reload_task: asyncio.Task | None = None
-        self.hass.bus.async_listen(
-            er.EVENT_ENTITY_REGISTRY_UPDATED,
-            self._handle_entity_registry_updated,
+        config_entry.async_on_unload(
+            self.hass.bus.async_listen(
+                er.EVENT_ENTITY_REGISTRY_UPDATED,
+                self._handle_entity_registry_updated,
+            )
         )
 
     @property