V17 Freezing at start and between tracks of audio

I’ve recently updated to v17 from v16.1 which didnt have these issues. Now whenever I try to play a music track or streaming audio my Kodi will freeze, becoming completely unresponsive on both my android phone and Windows PC. Eventually it will respond and the audio will start and plays a track fine, no stuttering, but once that track is finished the player will sit with 1sec remaining for ~2mins before starting the next track. Any help would be appreciated.