Disable node status sensor on node replacement

home-assistant · Dec 19, 2021 · d74470b · d74470b
1 parent 9870955
commit d74470b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
@@ -355,6 +355,11 @@ def async_on_node_removed(event: dict) -> None:
         assert device
         if replaced:
             discovered_value_ids.pop(device.id, None)
+
+            async_dispatcher_send(
+                hass,
+                f"{DOMAIN}_{client.driver.controller.home_id}.{node.node_id}.node_status_remove_entity",
+            )
         else:
             remove_device(device)
 

diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
@@ -520,4 +520,11 @@ async def async_added_to_hass(self) -> None:
                 self.async_poll_value,
             )
         )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{DOMAIN}_{self.unique_id}_remove_entity",
+                self.async_remove,
+            )
+        )
         self.async_write_ha_state()