diff --git a/esphome/dashboard/entries.py b/esphome/dashboard/entries.py
index 040dc1a094..66edf2c012 100644
--- a/esphome/dashboard/entries.py
+++ b/esphome/dashboard/entries.py
@@ -197,9 +197,9 @@ class DashboardEntries:
             bus.async_fire(EVENT_ENTRY_REMOVED, {"entry": entry})
 
         for entry in updated:
-            if original_names[entry] != entry.name:
-                name_to_entry[original_names[entry]].discard(entry.path)
-                name_to_entry[entry.name].add(entry.path)
+            if (original_name := original_names[entry]) != (current_name := entry.name):
+                name_to_entry[original_name].discard(entry.path)
+                name_to_entry[current_name].add(entry.path)
             bus.async_fire(EVENT_ENTRY_UPDATED, {"entry": entry})
 
     def _get_path_to_cache_key(self) -> dict[str, DashboardCacheKeyType]: