Using edge to control trainer fails on latest update

Using my edge 1040 solar connecting to my trainer and saying follow a target wattage, after random amounts of time (first time 20 minutes, second time 55 minutes) the unit will stop sending the proper ERG power wattage to control my trainer (wahoo kickr move) and will report a speed of 0 on the head unit triggering auto pause. 

If I then disconnect and reconnect the trainer (Ant+) it will then resume connection but is acting of the resistance sent back to the trainer is now in either slope or resistance mode and not a steady erg wattage. The Edge unit will still show the wattage settings with the + - buttons and if you then press those to change the wattage to try and bring the trainer back into erg mode, it then basically goes back into the state from before where then all speed is not captured and device goes into auto pause. 

Only way to get back to normal is to end the ride completely, tried stopping and restarting the device but that does not work. After ending the ride I then have to completely shut down the Edge and restart my wahoo trainer for this to work again. 

This has happened twice for me now with the new v25.24 update. 

Anyone else having this issue?