Fix assertion error when unloading ZHA with pollable entities (#107311)

home-assistant · Jan 6, 2024 · 003d2be · 003d2be
1 parent 5a01b55
commit 003d2be
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
@@ -216,9 +216,9 @@ async def async_added_to_hass(self) -> None:
 
     async def async_will_remove_from_hass(self) -> None:
         """Disconnect entity object when removed."""
-        assert self._cancel_refresh_handle
-        self._cancel_refresh_handle()
-        self._cancel_refresh_handle = None
+        if self._cancel_refresh_handle is not None:
+            self._cancel_refresh_handle()
+            self._cancel_refresh_handle = None
         self.debug("stopped polling during device removal")
         await super().async_will_remove_from_hass()