diff --git a/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java b/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
index fb12a924..ebc468fa 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
@@ -124,9 +124,10 @@ public class MultiPlayer implements Playback {
 
     @Override
     public void setDataSource(Song song) {
+        String uri = MusicUtil.getSongFileUri(song);
         MediaItem mediaItem = exoPlayer.getCurrentMediaItem();
 
-        if (mediaItem != null && mediaItem.mediaId.equals(song.getId())) {
+        if (mediaItem != null && mediaItem.playbackProperties.uri.toString().equals(uri)) {
             return;
         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
index 9baa6974..e805b12a 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
@@ -20,6 +20,7 @@ import android.os.Process;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -277,6 +278,7 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
     }
 
     private void saveProgress() {
+        Log.d(TAG, "saveProgress(): " + getSongProgressMillis());
         PreferenceUtil.getInstance(getApplicationContext()).setProgress(getSongProgressMillis());
     }