diff --git a/.gitignore b/.gitignore
index 4adf770..d37d10d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols
diff --git a/lib/ui/music_player.dart b/lib/ui/music_player.dart
index 5858811..1c6cb6a 100644
--- a/lib/ui/music_player.dart
+++ b/lib/ui/music_player.dart
@@ -55,7 +55,7 @@ class _MusicPlayerState extends State<MusicPlayer> {
 
     // Automatically choose next music if required
     if (currMusicPos >= _stack.length) {
-      var list = _playFilteredMusics
+      var list = (_playFilteredMusics && (_filteredList?.length ?? 0) > 1)
           ? _filteredList ?? widget.musicsList
           : widget.musicsList;
       var nextId = rng.nextInt(list.length);