diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index e4c37faf..fb8785a0 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -480,6 +480,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
     private void openCurrent() {
         synchronized (this) {
+            // current song will be null when queue is cleared
+            if (getCurrentSong() == null) return;
             playback.setDataSource(getTrackUri(getCurrentSong()));
         }
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
index 2b9b98ed..4c144f8b 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
@@ -26,8 +26,6 @@ import java.util.Locale;
 
 public class MusicUtil {
     public static Uri getSongFileUri(Song song) {
-        if (song.id == null) return null;
-
         StringBuilder builder = new StringBuilder();
         ApiClient apiClient = App.getApiClient();