diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java
index f768de46..dd4b0d79 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java
@@ -1,5 +1,7 @@
 package org.moire.ultrasonic.service;
 
+import androidx.annotation.Nullable;
+
 import org.moire.ultrasonic.domain.MusicDirectory;
 import org.moire.ultrasonic.util.LRUCache;
 import org.moire.ultrasonic.util.ShufflePlayBuffer;
@@ -28,6 +30,8 @@ public class Downloader
 {
     public final List<DownloadFile> downloadList = new ArrayList<>();
     public final List<DownloadFile> backgroundDownloadList = new ArrayList<>();
+
+    @Nullable
     public DownloadFile currentDownloading;
 
     private final ShufflePlayBuffer shufflePlayBuffer;
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt
index 994f06e8..beb71844 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt
@@ -409,9 +409,7 @@ class MediaPlayerController(
                 reset()
 
                 // Cancel current download, if necessary.
-                if (downloader.currentDownloading != null) {
-                    downloader.currentDownloading.cancelDownload()
-                }
+                downloader.currentDownloading?.cancelDownload()
             } else {
                 jukeboxMediaPlayer.stopJukeboxService()
             }