Zha group light.toggle requires two toggles to turn on again

Hi,
I’ve set up some zigbee groups in zha and I’ve noticed a strange behaviour when using light.toggle on a group. If I set my automation to a single entity, toggle works as expected, but with a group as the target, if I start with the lights on, the first toggle turns them off, the second toggle does nothing, the third toggle turns it on again. this is independent of whether I do the second toggle immediately or only after several seconds. Interestingly, this issue appears consistent for my hue bulbs but intermittent for my tint bulbs. Has anyone experienced something similar and might have an idea how to get around it?

After some more digging, it looks like it’s the same issue as described here Issues with state updates when controlling multiple lights with ZHA · Issue #36767 · home-assistant/core · GitHub which is strange since that’s supposed to be fixed as of 2 years ago. Somehow when I toggle the group off, while all lights actually turn off, some don’t report an off state, which looks like it’s causing the group to return the on state. If I toggle these off again in the UI, the next toggle actually turns the group on again.