diff --git a/lib/logic/audio_handler.dart b/lib/logic/audio_handler.dart
index ad3bf97..06ec59b 100644
--- a/lib/logic/audio_handler.dart
+++ b/lib/logic/audio_handler.dart
@@ -238,7 +238,8 @@ class AudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
         }
       }
 
-      medias.add(media_kit.Media(uri));
+      // Store the original track path in extras for queue lookup
+      medias.add(media_kit.Media(uri, extras: {'trackPath': item.id}));
     }
 
     if (medias.isNotEmpty) {
diff --git a/lib/ui/screens/player_screen.dart b/lib/ui/screens/player_screen.dart
index 1195e11..714962a 100644
--- a/lib/ui/screens/player_screen.dart
+++ b/lib/ui/screens/player_screen.dart
@@ -1177,7 +1177,7 @@ class _QueueView extends HookConsumerWidget {
                 itemBuilder: (context, index) {
                   final media = playlist.medias[index];
                   final isCurrent = index == playlist.index;
-                  final trackPath = media.uri;
+                  final trackPath = media.extras?['trackPath'] ?? media.uri;
                   final trackAsync = ref.watch(trackByPathProvider(trackPath));
 
                   return trackAsync.when(