diff --git a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
index df292264..611e0aaf 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
@@ -137,7 +137,7 @@ public class MultiPlayer implements Playback {
     @Override
     public void queueDataSource(Song song) {
         String path = MusicUtil.getSongFileUri(song);
-        if (mediaSource.getSize() == 2 && mediaSource.getMediaSource(1).getTag() != path) {
+        while (mediaSource.getSize() > 1) {
             mediaSource.removeMediaSource(1);
         }