diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt
index cb5a7694..59be1edc 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt
@@ -178,14 +178,14 @@ class ImageLoader(
     }
 
     /**
-     * Download a cover art file and cache it on disk
+     * Download a cover art file of a Track and cache it on disk
      */
     fun cacheCoverArt(track: Track) {
         cacheCoverArt(track.coverArt!!, FileUtil.getAlbumArtFile(track))
     }
 
     fun cacheCoverArt(id: String, file: String) {
-        if (id.isNullOrBlank()) return
+        if (id.isBlank()) return
         // Return if have a cache hit
         if (File(file).exists()) return
 
@@ -230,10 +230,10 @@ class ImageLoader(
     }
 
     private fun resolveSize(requested: Int, large: Boolean): Int {
-        if (requested <= 0) {
-            return if (large) config.largeSize else config.defaultSize
+        return if (requested <= 0) {
+            if (large) config.largeSize else config.defaultSize
         } else {
-            return requested
+            requested
         }
     }
 
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
index 75ae935f..6fbfa8fd 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/Downloader.kt
@@ -11,7 +11,6 @@ import android.net.wifi.WifiManager
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock as SystemClock
-import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.io.IOException
@@ -23,6 +22,7 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.moire.ultrasonic.data.ActiveServerProvider
 import org.moire.ultrasonic.data.MetaDatabase
+import org.moire.ultrasonic.domain.Album
 import org.moire.ultrasonic.domain.Artist
 import org.moire.ultrasonic.domain.Identifiable
 import org.moire.ultrasonic.domain.Track
@@ -285,7 +285,7 @@ class Downloader(
         Util.scanMedia(track.getPinnedFile())
     }
 
-    fun cancelDownload(track: Track) {
+    private fun cancelDownload(track: Track) {
         val key = activelyDownloading.keys.singleOrNull { t -> t.track.id == track.id } ?: return
         activelyDownloading[key]?.cancel()
     }
@@ -359,7 +359,7 @@ class Downloader(
 
                     // Hidden feature: If track is toggled between pinned/saved, refresh the metadata..
                     try {
-                        item.track.cacheMetadata()
+                        item.track.cacheMetadataAndArtwork()
                     } catch (ignore: Exception) {
                         Timber.w(ignore)
                     }
@@ -427,12 +427,10 @@ class Downloader(
                     }
 
                     try {
-                        item.track.cacheMetadata()
+                        item.track.cacheMetadataAndArtwork()
                     } catch (ignore: Exception) {
                         Timber.w(ignore)
                     }
-
-                    downloadAndSaveCoverArt()
                 }
 
                 if (item.pinned) {
@@ -481,11 +479,12 @@ class Downloader(
             return String.format(Locale.ROOT, "DownloadTask (%s)", item)
         }
 
-        private fun Track.cacheMetadata() {
+        private fun Track.cacheMetadataAndArtwork() {
             if (artistId.isNullOrEmpty()) return
 
             val onlineDB = activeServerProvider.getActiveMetaDatabase()
             val offlineDB = activeServerProvider.offlineMetaDatabase
+            val album: Album?
 
             cacheArtist(onlineDB, offlineDB, artistId!!)
 
@@ -493,9 +492,12 @@ class Downloader(
             if (albumId?.isNotEmpty() == true) {
                 // This is a cached call
                 val albums = musicService.getAlbumsOfArtist(artistId!!, null, false)
-                val album = albums.find { it.id == albumId }
+                album = albums.find { it.id == albumId }
 
                 if (album != null) {
+                    // Often the album entity returned from the server won't have the path set.
+                    if (album.path.isNullOrEmpty()) album.path = FileUtil.getParentPath(path)
+
                     offlineDB.albumDao().insert(album)
 
                     // If the album is a Compilation, also cache the Album artist
@@ -506,6 +508,9 @@ class Downloader(
 
             // Now cache the track data
             offlineDB.trackDao().insert(this)
+
+            // Download the largest size that we can display in the UI
+            imageLoaderProvider.getImageLoader().cacheCoverArt(this)
         }
 
         private fun cacheArtist(onlineDB: MetaDatabase, offlineDB: MetaDatabase, artistId: String) {
@@ -526,17 +531,6 @@ class Downloader(
             }
         }
 
-        private fun downloadAndSaveCoverArt() {
-            try {
-                if (!TextUtils.isEmpty(item.track.coverArt)) {
-                    // Download the largest size that we can display in the UI
-                    imageLoaderProvider.getImageLoader().cacheCoverArt(item.track)
-                }
-            } catch (all: Exception) {
-                Timber.e(all, "Failed to get cover art.")
-            }
-        }
-
         @Throws(IOException::class)
         fun InputStream.copyTo(out: OutputStream, onCopy: (totalBytesCopied: Long) -> Any): Long {
             var bytesCopied: Long = 0
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
index 11fef99a..854660a0 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
@@ -209,7 +209,8 @@ object FileUtil {
 
     private fun getAlbumDirectory(entry: MusicDirectory.Child): String {
         val dir: String
-        if (!TextUtils.isEmpty(entry.path) && getParentPath(entry.path!!) != null) {
+        val isFileInRoot = !entry.isDirectory && (getParentPath(entry.path) == null)
+        if (!TextUtils.isEmpty(entry.path) && !isFileInRoot) {
             val f = fileSystemSafeDir(entry.path)
             dir = String.format(
                 Locale.ROOT,
@@ -413,8 +414,8 @@ object FileUtil {
         return path.substringAfterLast('/')
     }
 
-    fun getParentPath(path: String): String? {
-        if (!path.contains('/')) return null
+    fun getParentPath(path: String?): String? {
+        if (path == null || !path.contains('/')) return null
         return path.substringBeforeLast('/')
     }