diff --git a/homeassistant/components/guardian/util.py b/homeassistant/components/guardian/util.py
index ffa57322551..a5e91dce813 100644
--- a/homeassistant/components/guardian/util.py
+++ b/homeassistant/components/guardian/util.py
@@ -48,9 +48,10 @@ def async_finish_entity_domain_replacements(
         try:
             [registry_entry] = [
                 registry_entry
-                for registry_entry in ent_reg.entities.values()
-                if registry_entry.config_entry_id == entry.entry_id
-                and registry_entry.domain == strategy.old_domain
+                for registry_entry in er.async_entries_for_config_entry(
+                    ent_reg, entry.entry_id
+                )
+                if registry_entry.domain == strategy.old_domain
                 and registry_entry.unique_id == strategy.old_unique_id
             ]
         except ValueError: