Optimize use_device_name check in base entity class (#106209)

2023-12-23 13:30:33 -10:00 · 2023-12-23 13:30:33 -10:00 · b757984031
commit b757984031
parent 6e6d7a0c92
1 changed files with 1 additions and 1 deletions
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@ -958,7 +958,7 @@ class Entity(
            return name

        device_name = device_entry.name_by_user or device_entry.name
-        if self.use_device_name:
+        if name is None and self.use_device_name:
            return device_name
        return f"{device_name} {name}" if device_name else name