Smart Notifications break when Phone connectivity is lost and restored

Lately I am struggling with Smart Notifications. I want to keep receiving them but if I go downstairs and forget my phone upstairs, the bluetooth connection breaks and restores automatically (I get the notification). However, after this happens, my watch stops receiving Smart Notifications entirely. This has nothing to do with Do Not Disturb or Sleep Times. 

The fix is to remove and re-add the device each time in Garmin Connect and of course keep the watch and phone within a small distance of each other. This seems to be a bug to me - when it resumes connectivity, the watch forgets that it can receive notifications. I tried finding a beta version where maybe this is fixed but there is nothing later than 4.16 from what I can tell. 

I have tried all the troubleshooting steps, everything is configured correctly and all permissions are what they need to be. Notifications work fine, then just stop working when I get the drop and reconnect. Pretty frustrating having to re-add the watch every time.