diff --git a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
index 2074333d..9fc43e63 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
@@ -219,7 +219,6 @@ public class MappingUtil {
                 .setMediaId(media.getId())
                 .setMediaMetadata(
                         new MediaMetadata.Builder()
-                                .setMediaUri(getUri(context, media, stream && !isDownloaded))
                                 .setTitle(MusicUtil.getReadableString(media.getTitle()))
                                 .setTrackNumber(media.getTrackNumber())
                                 .setDiscNumber(media.getDiscNumber())
@@ -229,6 +228,12 @@ public class MappingUtil {
                                 .setExtras(bundle)
                                 .build()
                 )
+                .setRequestMetadata(
+                        new MediaItem.RequestMetadata.Builder()
+                                .setMediaUri(getUri(context, media, stream && !isDownloaded))
+                                .setExtras(bundle)
+                                .build()
+                )
                 .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
                 .setUri(getUri(context, media, stream && !isDownloaded))
                 .build();