diff --git a/lib/api/audio/audioplayer_service.dart b/lib/api/audio/audioplayer_service.dart
index 23e77a6..520ea48 100644
--- a/lib/api/audio/audioplayer_service.dart
+++ b/lib/api/audio/audioplayer_service.dart
@@ -40,9 +40,8 @@ class AudioPlayerService {
   /// Currently playing song
   ///
   /// Null if no song is loaded
-  Song? get song => _player.currentIndex == null || _player.currentIndex == -1
-      ? null
-      : _songList[_player.currentIndex!];
+  Song? get song =>
+      _player.currentIndex == null ? null : _songList[_player.currentIndex!];
 
   final _queue = ConcatenatingAudioSource(
     children: [],
@@ -126,6 +125,7 @@ class AudioPlayerService {
     await _queue.clear();
     _songList
       ..clear()
+      ..addAll(queuePast)
       ..addAll(queueNext);
 
     final q = List<AudioSource>.generate(