diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
index 45f00b0b9..6a52c35ba 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
@@ -85,7 +85,7 @@ class InterpreterImpl @Inject constructor(private val preparer: Preparer) : Inte
         val uidMap = mutableMapOf<Music.UID, SongImpl>()
         val songs =
             albumLinkedSongs.mapNotNull {
-                val uid = it.preSong.computeUid()
+                val uid = it.preSong.uid
                 val other = uidMap[uid]
                 if (other == null) {
                     SongImpl(it)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
index fdb3059f1..35511ef8a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
@@ -43,7 +43,7 @@ import org.oxycblt.auxio.util.update
 class SongImpl(linkedSong: LinkedSong) : Song {
     private val preSong = linkedSong.preSong
 
-    override val uid = preSong.computeUid()
+    override val uid = preSong.uid
     override val name = preSong.name
     override val track = preSong.track
     override val disc = preSong.disc
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
index 74f8301bf..ced560204 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
@@ -52,7 +52,7 @@ data class PreSong(
     val preArtists: List<PreArtist>,
     val preGenres: List<PreGenre>
 ) {
-    fun computeUid() =
+    val uid =
         musicBrainzId?.let { Music.UID.musicBrainz(MusicType.SONGS, it) }
             ?: Music.UID.auxio(MusicType.SONGS) {
                 // Song UIDs are based on the raw data without parsing so that they remain