Homekit - Resets default room

I’m currently adding more knx-devices to Home Assistant.
When having an error in my configuration all devices added to HomeKit are reset (back to default room etc.).
I am not configuring HomeKit using yaml at the moment.

How can i prevent it from happening as it is very annoying with a lot of devices.

Thanks.