From 6463b8165f964dc7e068143d5e8b22a7e2f00ff5 Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Wed, 10 Apr 2019 22:35:28 +0200 Subject: [PATCH] Fix deCONZ change entity_id bug (#22974) Fix deCONZ change entity_id bug --- homeassistant/components/deconz/deconz_device.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/deconz/deconz_device.py b/homeassistant/components/deconz/deconz_device.py index 0c5cbeef1fb..6923c93dd6f 100644 --- a/homeassistant/components/deconz/deconz_device.py +++ b/homeassistant/components/deconz/deconz_device.py @@ -26,10 +26,9 @@ class DeconzDevice(Entity): async def async_will_remove_from_hass(self) -> None: """Disconnect device object when removed.""" - if self.unsub_dispatcher is not None: - self.unsub_dispatcher() self._device.remove_callback(self.async_update_callback) - self._device = None + del self.gateway.deconz_ids[self.entity_id] + self.unsub_dispatcher() @callback def async_update_callback(self, reason):