From b7579840310b389211ef2596f079944f12b00aa9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 23 Dec 2023 13:30:33 -1000 Subject: [PATCH] Optimize use_device_name check in base entity class (#106209) --- homeassistant/helpers/entity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py index 95d003cd11c..bf30943fb58 100644 --- 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