diff --git a/musikr/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt b/musikr/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
index e50711f4b..ec03aa5eb 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt
@@ -69,16 +69,17 @@ private class EvaluateStepImpl(
         val preSongs =
             rawSongs
                 .map { tagInterpreter.interpret(it, interpretation) }
-                .flowOn(Dispatchers.Main)
+                .flowOn(Dispatchers.Default)
                 .buffer(Channel.UNLIMITED)
         val prePlaylists =
             filterFlow.left
                 .map { playlistInterpreter.interpret(it, interpretation) }
-                .flowOn(Dispatchers.Main)
+                .flowOn(Dispatchers.Default)
                 .buffer(Channel.UNLIMITED)
         val graphBuilder = MusicGraph.builder()
         val graphBuild =
             merge(
+                filterFlow.manager,
                 preSongs.onEach { graphBuilder.add(it) },
                 prePlaylists.onEach { graphBuilder.add(it) })
         graphBuild.collect()