Naim App - Tidal gets stuck in a loop

If I'm streaming from Tidal with the Naim App in 'List' mode when it moves onto the next track it will play about one second of that track and then go back to the previous track for one second, then back to the next track for one second and so on.  If you don't use List mode it all works fine.  Indeed if you switch away from List mode whilst it's stuck it then plays properly from whichever track it was attempting to play at the time.

I've tried on two different Android devices (Fire & Samsung phone) both running V2.7.0 of the Naim App with the same result.

This is using an ND5 XS displaying firmware 4.6.  I've not tried it on my Muso Qb yet to see if it does the same.

Anybody else have the same issue? Or a solution