From 3c2f729ddc8b04c9633ddaaced013ac41fc3a92a Mon Sep 17 00:00:00 2001 From: TheJulianJES Date: Thu, 13 Nov 2025 08:18:22 +0100 Subject: [PATCH] Fix Z-Wave generating name before setting entity description (#156494) --- homeassistant/components/zwave_js/entity.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/zwave_js/entity.py b/homeassistant/components/zwave_js/entity.py index ab892565c0f..263e5c20467 100644 --- a/homeassistant/components/zwave_js/entity.py +++ b/homeassistant/components/zwave_js/entity.py @@ -71,8 +71,6 @@ class ZWaveBaseEntity(Entity): ) # Entity class attributes - self._attr_name = self.generate_name() - self._attr_unique_id = get_unique_id(driver, self.info.primary_value.value_id) if isinstance(info, NewZwaveDiscoveryInfo): self.entity_description = info.entity_description else: @@ -80,6 +78,8 @@ class ZWaveBaseEntity(Entity): self._attr_entity_registry_enabled_default = enabled_default if (entity_category := info.entity_category) is not None: self._attr_entity_category = entity_category + self._attr_name = self.generate_name() + self._attr_unique_id = get_unique_id(driver, self.info.primary_value.value_id) self._attr_assumed_state = self.info.assumed_state # device is precreated in main handler self._attr_device_info = DeviceInfo(