From 1bd0b2d05f2e4e53fd57f3a9faa195bebfffc396 Mon Sep 17 00:00:00 2001 From: Jan Bouwhuis Date: Fri, 20 Oct 2023 20:28:04 +0200 Subject: [PATCH] Refactor mqtt entity cleanup on reload (#102375) --- homeassistant/components/mqtt/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py index 9f3fe6ef72b..abf4cc65dea 100644 --- a/homeassistant/components/mqtt/__init__.py +++ b/homeassistant/components/mqtt/__init__.py @@ -426,9 +426,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: entity.async_remove() for mqtt_platform in mqtt_platforms for entity in mqtt_platform.entities.values() - # pylint: disable-next=protected-access - if not entity._discovery_data # type: ignore[attr-defined] - if mqtt_platform.config_entry + if getattr(entity, "_discovery_data", None) is None + and mqtt_platform.config_entry and mqtt_platform.domain in RELOADABLE_PLATFORMS ] await asyncio.gather(*tasks)