I've opened an issue for this. I believe I've identified the two bugs that cause this issue and how to fix them, but I'm not a game dev so hopefully someone else can tackle this at some point (thanks again for the volunteer work). Link here:

https://github.com/FAForever/fa/issues/5989