From b229347625b3c0bee1fe131d70b6258e9521fec2 Mon Sep 17 00:00:00 2001
From: shbatm <support@shbatm.com>
Date: Mon, 16 Jan 2023 12:43:42 -0600
Subject: [PATCH] Fix entity cleanup and naming bugs in ISY994 (#86023)

---
 homeassistant/components/isy994/button.py | 2 +-
 homeassistant/components/isy994/entity.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/isy994/button.py b/homeassistant/components/isy994/button.py
index 953ebcdae0d..e4d7fb807eb 100644
--- a/homeassistant/components/isy994/button.py
+++ b/homeassistant/components/isy994/button.py
@@ -74,7 +74,7 @@ async def async_setup_entry(
         ISYNodeQueryButtonEntity(
             node=isy,
             name="Query",
-            unique_id=isy.uuid,
+            unique_id=f"{isy.uuid}_query",
             device_info=DeviceInfo(identifiers={(DOMAIN, isy.uuid)}),
             entity_category=EntityCategory.DIAGNOSTIC,
         )
diff --git a/homeassistant/components/isy994/entity.py b/homeassistant/components/isy994/entity.py
index e85a22241c9..425f1fe5b87 100644
--- a/homeassistant/components/isy994/entity.py
+++ b/homeassistant/components/isy994/entity.py
@@ -94,7 +94,7 @@ class ISYNodeEntity(ISYEntity):
     ) -> None:
         """Initialize the ISY/IoX node entity."""
         super().__init__(node, device_info=device_info)
-        if node.address == node.primary_node:
+        if hasattr(node, "parent_node") and node.parent_node is None:
             self._attr_has_entity_name = True
             self._attr_name = None