diff --git a/homeassistant/components/rainmachine/util.py b/homeassistant/components/rainmachine/util.py index dfb03b11b5d..77a91c627a9 100644 --- a/homeassistant/components/rainmachine/util.py +++ b/homeassistant/components/rainmachine/util.py @@ -60,9 +60,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 ent_reg.entities.get_entries_for_config_entry_id( + entry.entry_id + ) + if registry_entry.domain == strategy.old_domain and registry_entry.unique_id == strategy.old_unique_id ] except ValueError: