diff --git a/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt b/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt
index dfb8dbdb2..96f969fad 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/covers/fs/FSCovers.kt
@@ -24,7 +24,6 @@ import android.net.Uri
 import android.os.ParcelFileDescriptor
 import androidx.core.net.toUri
 import java.io.InputStream
-import kotlin.math.max
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.oxycblt.musikr.covers.Cover
@@ -101,7 +100,7 @@ class MutableFSCovers(private val context: Context) : MutableCovers<FDCover> {
         val bestCover =
             parent.children
                 .filterIsInstance<DeviceFile>()
-                .map { it to coverArtScore(file) }
+                .map { it to coverArtScore(it) }
                 .maxBy { it.second }
         if (bestCover.second > 0) {
             return CoverResult.Hit(FolderCoverImpl(context, bestCover.first.uri))
@@ -135,10 +134,8 @@ class MutableFSCovers(private val context: Context) : MutableCovers<FDCover> {
                 .sumOf { it.index + 1 }
         // Multiply the score for preferred formats & extensions. Weirder formats are harder for
         // android to decode, but not the end of the world.
-        score *=
-            max(preferredFormats.indexOfFirst { file.mimeType.equals(it, ignoreCase = true) }, 0)
-        score *=
-            max(preferredExtensions.indexOfFirst { extension.equals(it, ignoreCase = true) }, 0)
+        score *= preferredFormats.indexOfFirst { file.mimeType.equals(it, ignoreCase = true) } + 2
+        score *= preferredExtensions.indexOfFirst { extension.equals(it, ignoreCase = true) } + 2
         return score
     }