Phone issues when using earbuds on series 5 watch

Hey guys,
I’m having a really annoying issue with my series 5 on Watch OS 6.1.1. It’s a known issue that Apple is working on. Wondering if others are experiencing this, and if any workarounds.
I have 2 sets of wireless earbuds. Both function as they should. No issues when connected to phone. Also no issues when connected to watch, unless I initiate a call. When I make a call on Watch, call disconnects from buds and continues from Watch speaker. When call ends, buds reconnect.
Are you experiencing this? Have you found way to keep buds connected?
Thanks,
JP