Can't select Standalone Controllable or Standalone Cadence

Every time I start up Zwift on my MacBook Air and/or AppleTV 4K I cannot select to use my Quarq Dzero without first having it paired as the power source.

In addition, I can’t select my Wahoo Kickr Gen2 as the Controllable Resistance source without first pairing it as the Power source.

So, in order for me to start a ride with power and cadence setup I need to first pair my Kickr as the power source in order to get Controllable set. Then I need to unpair the Kickr and pair my Quarq in order to get power and cadence readings from that.

I guess the real issue I want resolved is please allow me to pair a Controllable Resistance device without making me pair a power meter first.