Same device 're-discovered' after adoption of original

So I’m still trying to get my head around ESPHome. I’ve managed to get the HA Glow working and running and now I’ve recently added the ESP32-Box for a voice assistant.

My issue is that I’ve adopted the ESP32-Box. Tweaked the yaml to use my own images on the display and now the same device has been discovered again, leaving me with 2 entries on the EPSHome page.

I’ve left it for days and it’s still there. I’ve deleted the current one and re-adopted. I’ve tried to tweak the yaml so the device names are the same.

How do I get rid of the ‘discovered’ device and prevent it from coming back?

UPDATE: The correctly working and fully usable ESP32-Box is always showing as Offline, yet I can edit it, re-compile the code and wirelessly push it.

I have had exactly the same problem, even tried taking device offline, deleting everything and trying again, but keep doing it.