HomePod Broke Geofencing with Homekit

So, I was using the Leaving Home and Arriving Home automations with HomeKit and all was going fine when I was able to use my Apple TV as my home hub.

Enter my HomePod purchase. Now these automations have stopped working and I have no way to tell the Home App that I would much prefer using my hardwired Apple TV as a hub instead of my HomePod.

I've seen similar results online that the HomePods have broken Geofencing automation. Anybody have a solution to this?

Thanks.