diff --git a/homeassistant/components/zha/entity.py b/homeassistant/components/zha/entity.py index e07092a379c..cfcbadb3d83 100644 --- a/homeassistant/components/zha/entity.py +++ b/homeassistant/components/zha/entity.py @@ -320,6 +320,7 @@ class ZhaGroupEntity(BaseZhaEntity): immediate=False, function=functools.partial(self.async_update_ha_state, True), ) + self.async_on_remove(self._change_listener_debouncer.async_cancel) self._async_unsub_state_changed = async_track_state_change_event( self.hass, self._entity_ids, self.async_state_changed_listener ) diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py index e97f32fe527..99c759dfbc6 100644 --- a/homeassistant/components/zha/light.py +++ b/homeassistant/components/zha/light.py @@ -1178,6 +1178,7 @@ class LightGroup(BaseLight, ZhaGroupEntity): function=self._force_member_updates, ) self._debounced_member_refresh = force_refresh_debouncer + self.async_on_remove(force_refresh_debouncer.async_cancel) async def async_turn_on(self, **kwargs: Any) -> None: """Turn the entity on."""