From fa39b6bebd38136e4ea4cdd4b809b537be288806 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 23 Dec 2025 00:16:53 -1000
Subject: [PATCH] fixes

---
 esphome/core/entity_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/entity_helpers.py b/esphome/core/entity_helpers.py
index ac23ea6d34..1ddba8caf6 100644
--- a/esphome/core/entity_helpers.py
+++ b/esphome/core/entity_helpers.py
@@ -96,7 +96,7 @@ async def setup_entity(var: MockObj, config: ConfigType, platform: str) -> None:
         if device_name:
             # Entity on sub-device - use device name
             base_name = device_name
-        elif CORE.config.get("name_add_mac_suffix", False):
+        elif CORE.config and CORE.config.get("name_add_mac_suffix", False):
             # MAC suffix enabled - OLD behavior used friendly_name directly (even if empty)
             # This is bug-for-bug compatibility
             base_name = CORE.friendly_name or ""