diff --git a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
index 015e94a54..5ec65c1bb 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
@@ -340,7 +340,7 @@ internal class GenreVertex(val preGenre: PreGenre) {
 }
 
 internal class PlaylistVertex(val prePlaylist: PrePlaylist) {
-    val songVertices = mutableListOf<SongVertex?>()
-    val pointerMap = mutableMapOf<SongPointer, Int>()
+    val songVertices = Array<SongVertex?>(prePlaylist.songPointers.size) { null}
+    val pointerMap = prePlaylist.songPointers.withIndex().associateBy { it.value }.mapValuesTo(mutableMapOf()) { it.value.index }
     val tag: Any? = null
 }