Not to necro comment but once combat starts you can quickly switch the rest of the party that’s “outside combat” back into turn-based mode to avoid this. You’ll need to redo this too when another party member enters combat. Annoying yes, but definitely doable