Dual wahoo setup fails with Zwift Companion

We both love Zwift!!!
So we both have a complete Wahoo Kikr, Tickr and cadance sensor setup.
But every time when we run Zwift simultaneously, the companion App is spoiling the fun. Even when the devices are not paired to one another’s Wahoo Fitness App, the companion App is making the pair with multiple devices. This always happens when we start, but also during the Zwift session.
I run the Companion App on IOS, my fox on Android.
Can somebody please help us with this issue, this is really destroying every training!

Thx a lot

Get one Kickr and rider set up completely, sitting in whichever world ready to ride. Then, set the other rider up. ??