From 14d90b548414b6438dffe13958b57cdb5165cfe3 Mon Sep 17 00:00:00 2001 From: damarco Date: Thu, 13 Dec 2018 23:08:35 +0100 Subject: [PATCH] Always add friendly name attribute to ZHA entities (#19141) * Always add friendly name attribute * Only change device_info name --- homeassistant/components/zha/entities/entity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/zha/entities/entity.py b/homeassistant/components/zha/entities/entity.py index da8f615a665..25b98255048 100644 --- a/homeassistant/components/zha/entities/entity.py +++ b/homeassistant/components/zha/entities/entity.py @@ -100,6 +100,6 @@ class ZhaEntity(entity.Entity): 'identifiers': {(DOMAIN, ieee)}, 'manufacturer': self._endpoint.manufacturer, 'model': self._endpoint.model, - 'name': self._device_state_attributes['friendly_name'], + 'name': self._device_state_attributes.get('friendly_name', ieee), 'via_hub': (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]), }