diff --git a/lib/src/playlists/playlist_client.dart b/lib/src/playlists/playlist_client.dart
index a8964cd..d252ed6 100644
--- a/lib/src/playlists/playlist_client.dart
+++ b/lib/src/playlists/playlist_client.dart
@@ -76,7 +76,7 @@ class PlaylistClient {
       final response = await _http.get(uri);
       final actualTracks = jsonDecode(response.body) as List;
       
-      yield actualTracks.map((t) => Track.fromJson(t));
+      yield batchIds.map((id) => Track.fromJson(actualTracks.where((t) => t["id"] == id).single));
 
       continuationOffset += actualTracks.length;
     }