diff --git a/lib/provider/proxy_playlist/player_listeners.dart b/lib/provider/proxy_playlist/player_listeners.dart
index bc91ae0a..b6839df6 100644
--- a/lib/provider/proxy_playlist/player_listeners.dart
+++ b/lib/provider/proxy_playlist/player_listeners.dart
@@ -74,8 +74,9 @@ extension ProxyPlaylistListeners on ProxyPlaylistNotifier {
 
       if (lastTrack == nextTrack.id) return;
 
-      await ref.read(sourcedTrackProvider(nextTrack).future);
-      lastTrack = nextTrack.id!;
+      await ref.read(sourcedTrackProvider(nextTrack).future).whenComplete(() {
+        lastTrack = nextTrack.id!;
+      });
     });
   }