diff --git a/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt b/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt
index d6a2cb214..8ca2fa5ad 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt
@@ -99,12 +99,22 @@ private class ExtractStepImpl(
                                 it.song.cover?.id,
                                 it.song.addedMs)
                         cache.write(cachedSong)
-                        exclude.add(cachedSong)
                         Finalized(it.song)
                     }
                 }
             }
-            .map { it.extracted }
+            .map {
+                if (it.extracted is RawSong) {
+                    exclude.add(
+                        CachedSong(
+                            it.extracted.file,
+                            it.extracted.properties,
+                            it.extracted.tags,
+                            it.extracted.cover?.id,
+                            it.extracted.addedMs))
+                }
+                it.extracted
+            }
             .flowOn(Dispatchers.IO)
             .buffer(Channel.UNLIMITED)
             .onCompletion { cache.cleanup(exclude) }