diff --git a/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
index edde35443..0c4e5e076 100644
--- a/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
+++ b/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
@@ -53,7 +53,7 @@ constructor(
         val preSongs =
             extractedMusic
                 .filterIsInstance<ExtractedMusic.Song>()
-                .map { tagInterpreter.interpret(it.file, it.tags, interpretation) }
+                .map { tagInterpreter.interpret(it.file, it.tags, it.cover, interpretation) }
                 .flowOn(Dispatchers.Main)
                 .buffer(Channel.UNLIMITED)
         val graphBuilder = musicGraphFactory.builder()
diff --git a/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt
index bcdd468eb..ec2a40e43 100644
--- a/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt
+++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt
@@ -24,6 +24,7 @@ import org.oxycblt.auxio.music.MusicType
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
 import org.oxycblt.auxio.util.update
 import org.oxycblt.musikr.Music
+import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.fs.MimeType
 import org.oxycblt.musikr.fs.Path
 import org.oxycblt.musikr.playlist.PlaylistHandle
@@ -47,6 +48,7 @@ data class PreSong(
     val replayGainAdjustment: ReplayGainAdjustment,
     val lastModified: Long,
     val dateAdded: Long,
+    val cover: Cover?,
     val preAlbum: PreAlbum,
     val preArtists: List<PreArtist>,
     val preGenres: List<PreGenre>
diff --git a/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
index 87229dfd8..85b03f037 100644
--- a/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
+++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
@@ -23,6 +23,7 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
 import org.oxycblt.auxio.util.toUuidOrNull
 import org.oxycblt.musikr.Interpretation
+import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.fs.MimeType
 import org.oxycblt.musikr.fs.query.DeviceFile
 import org.oxycblt.musikr.tag.Disc
@@ -32,13 +33,19 @@ import org.oxycblt.musikr.tag.parse.ParsedTags
 import org.oxycblt.musikr.tag.util.parseId3GenreNames
 
 interface TagInterpreter {
-    fun interpret(file: DeviceFile, parsedTags: ParsedTags, interpretation: Interpretation): PreSong
+    fun interpret(
+        file: DeviceFile,
+        parsedTags: ParsedTags,
+        cover: Cover?,
+        interpretation: Interpretation
+    ): PreSong
 }
 
 class TagInterpreterImpl @Inject constructor() : TagInterpreter {
     override fun interpret(
         file: DeviceFile,
         parsedTags: ParsedTags,
+        cover: Cover?,
         interpretation: Interpretation
     ): PreSong {
         val individualPreArtists =
@@ -82,7 +89,8 @@ class TagInterpreterImpl @Inject constructor() : TagInterpreter {
             dateAdded = file.lastModified,
             preAlbum = preAlbum,
             preArtists = rawArtists,
-            preGenres = rawGenres)
+            preGenres = rawGenres,
+            cover = null)
     }
 
     private fun makePreAlbum(