diff --git a/app/src/main/java/com/cappielloantonio/play/service/MediaService.java b/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
index 6ace129e..d24296fc 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
@@ -127,8 +127,11 @@ public class MediaService extends MediaLibraryService implements SessionAvailabi
         player.addListener(new Player.Listener() {
             @Override
             public void onMediaItemTransition(@Nullable MediaItem mediaItem, int reason) {
+                if (mediaItem == null) return;
+
                 MediaManager.setLastPlayedTimestamp(mediaItem);
-                if(mediaItem.mediaMetadata.extras.getString("mediaType").equals(Media.MEDIA_TYPE_MUSIC)) MediaManager.scrobble(mediaItem);
+                if (mediaItem.mediaMetadata.extras.getString("mediaType").equals(Media.MEDIA_TYPE_MUSIC))
+                    MediaManager.scrobble(mediaItem);
             }
 
             @Override