From 85d2ba047b9ec16fa54e0b5e84cb2a94b1f98297 Mon Sep 17 00:00:00 2001 From: "David F. Mulcahey" Date: Mon, 23 Dec 2019 19:11:35 -0500 Subject: [PATCH] Protect against bad data stored in ZHA (#30183) --- homeassistant/components/zha/api.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/zha/api.py b/homeassistant/components/zha/api.py index d9c1db2ae5d..1294fcaedbd 100644 --- a/homeassistant/components/zha/api.py +++ b/homeassistant/components/zha/api.py @@ -449,7 +449,11 @@ async def remove_group(group, zha_gateway): group.group_id ) ) - await asyncio.gather(*tasks) + if tasks: + await asyncio.gather(*tasks) + else: + # we have members but none are tracked by ZHA for whatever reason + zha_gateway.application_controller.groups.pop(group.group_id) else: zha_gateway.application_controller.groups.pop(group.group_id)