From e9a41e50237a0db54f6ab4e2968735d8043b06a9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 5 Feb 2024 13:53:33 -0600 Subject: [PATCH] Avoid linear search in entity registry to clear an area (#109735) --- homeassistant/helpers/entity_registry.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py index 5eb8a37176a..bab6ae245a7 100644 --- a/homeassistant/helpers/entity_registry.py +++ b/homeassistant/helpers/entity_registry.py @@ -1251,9 +1251,8 @@ class EntityRegistry: @callback def async_clear_area_id(self, area_id: str) -> None: """Clear area id from registry entries.""" - for entity_id, entry in self.entities.items(): - if area_id == entry.area_id: - self.async_update_entity(entity_id, area_id=None) + for entry in self.entities.get_entries_for_area_id(area_id): + self.async_update_entity(entry.entity_id, area_id=None) @callback