diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
index dd5b8d5e..ee9f6423 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
@@ -71,9 +71,9 @@ public class MappingUtil {
                 .setMediaMetadata(
                         new MediaMetadata.Builder()
                                 .setTitle(MusicUtil.getReadableString(media.getTitle()))
-                                .setTrackNumber(media.getTrack())
-                                .setDiscNumber(media.getDiscNumber())
-                                .setReleaseYear(media.getYear())
+                                .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
+                                .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
+                                .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
                                 .setAlbumTitle(MusicUtil.getReadableString(media.getAlbum()))
                                 .setArtist(MusicUtil.getReadableString(media.getArtist()))
                                 .setExtras(bundle)
@@ -106,9 +106,9 @@ public class MappingUtil {
                 .setMediaMetadata(
                         new MediaMetadata.Builder()
                                 .setTitle(MusicUtil.getReadableString(media.getTitle()))
-                                .setTrackNumber(media.getTrack())
-                                .setDiscNumber(media.getDiscNumber())
-                                .setReleaseYear(media.getYear())
+                                .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
+                                .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
+                                .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
                                 .setAlbumTitle(MusicUtil.getReadableString(media.getAlbum()))
                                 .setArtist(MusicUtil.getReadableString(media.getArtist()))
                                 .build()
@@ -195,9 +195,9 @@ public class MappingUtil {
                 .setMediaMetadata(
                         new MediaMetadata.Builder()
                                 .setTitle(MusicUtil.getReadableString(podcastEpisode.getTitle()))
-                                .setTrackNumber(podcastEpisode.getTrack())
-                                .setDiscNumber(podcastEpisode.getDiscNumber())
-                                .setReleaseYear(podcastEpisode.getYear())
+                                .setTrackNumber(podcastEpisode.getTrack() != null ? podcastEpisode.getTrack() : 0)
+                                .setDiscNumber(podcastEpisode.getDiscNumber() != null ? podcastEpisode.getDiscNumber() : 0)
+                                .setReleaseYear(podcastEpisode.getYear() != null ? podcastEpisode.getYear() : 0)
                                 .setAlbumTitle(MusicUtil.getReadableString(podcastEpisode.getAlbum()))
                                 .setArtist(MusicUtil.getReadableString(podcastEpisode.getArtist()))
                                 .setExtras(bundle)