From 93fd82d1fa95214e342066d8031ced35f26e76b9 Mon Sep 17 00:00:00 2001 From: starkillerOG Date: Fri, 9 May 2025 14:50:00 +0200 Subject: [PATCH] Prevent errors during cleaning of connections/identifiers in device registry (#144558) --- homeassistant/helpers/device_registry.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py index 79d6774c407..a80e74e7eb2 100644 --- a/homeassistant/helpers/device_registry.py +++ b/homeassistant/helpers/device_registry.py @@ -575,9 +575,11 @@ class DeviceRegistryItems[_EntryTypeT: (DeviceEntry, DeletedDeviceEntry)]( """Unindex an entry.""" old_entry = self.data[key] for connection in old_entry.connections: - del self._connections[connection] + if connection in self._connections: + del self._connections[connection] for identifier in old_entry.identifiers: - del self._identifiers[identifier] + if identifier in self._identifiers: + del self._identifiers[identifier] def get_entry( self,