Multiple Shelly devices appearing under one device

Hi everyone. I have a number of Shelly devices in my home. On the weekend we had a power outage and when everything came back online there were a few quirks. In the past after a power outage, the timing of the router, Shelly devices and Home Assistant coming back online caused some issues with devices not being available which was easily resolved by restarting Home Assistant. This time that resolved most of my problems except this particular scenario.

I have one Shelly device named Entry-02. It’s appearing in the dashboard, but has 3 devices under it. These devices are Alarm, Entry-02 and Kitchen-01

image

Entry-02 and Kitchen-01 are also appearing on the Shelly integration tile however Alarm does not appear.

image

In terms of functionality, Alarm and Kitchen-01 actually seem to be working fine, however the entities for Entry-02 are no longer working.

I have tried restarting Home Assistant, restarting the router and restarting the three Shelly devices but the problem persists.

Does anyone have any idea what I should do to resolve this? Should I just be removing and adding the Shelly devices again, keeping their old entity names so as not to break any of my automations?

Thanks in advance for any advice you can provide.