diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt
index fcf65715a..97390fe8a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt
@@ -88,13 +88,8 @@ fun Song.toMediaItem(context: Context, parent: MusicParent?): MediaItem {
         .build()
 }
 
-fun Album.toMediaItem(context: Context, parent: Artist?): MediaItem {
-    val mediaSessionUID =
-        if (parent == null) {
-            MediaSessionUID.Single(uid)
-        } else {
-            MediaSessionUID.Joined(parent.uid, uid)
-        }
+fun Album.toMediaItem(context: Context): MediaItem {
+    val mediaSessionUID = MediaSessionUID.Single(uid)
     val metadata =
         MediaMetadata.Builder()
             .setTitle(name.resolve(context))
@@ -119,13 +114,8 @@ fun Album.toMediaItem(context: Context, parent: Artist?): MediaItem {
         .build()
 }
 
-fun Artist.toMediaItem(context: Context, parent: Genre?): MediaItem {
-    val mediaSessionUID =
-        if (parent == null) {
-            MediaSessionUID.Single(uid)
-        } else {
-            MediaSessionUID.Joined(parent.uid, uid)
-        }
+fun Artist.toMediaItem(context: Context): MediaItem {
+    val mediaSessionUID = MediaSessionUID.Single(uid)
     val metadata =
         MediaMetadata.Builder()
             .setTitle(name.resolve(context))
diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
index d56263a0b..0ad310744 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/MusicMediaItemBrowser.kt
@@ -82,8 +82,8 @@ constructor(
                 ?: return null
 
         return when (music) {
-            is Album -> music.toMediaItem(context, null)
-            is Artist -> music.toMediaItem(context, null)
+            is Album -> music.toMediaItem(context)
+            is Artist -> music.toMediaItem(context)
             is Genre -> music.toMediaItem(context)
             is Playlist -> music.toMediaItem(context)
             is Song -> music.toMediaItem(context, null)
@@ -120,9 +120,9 @@ constructor(
                     MediaSessionUID.Category.SONGS ->
                         deviceLibrary.songs.map { it.toMediaItem(context, null) }
                     MediaSessionUID.Category.ALBUMS ->
-                        deviceLibrary.albums.map { it.toMediaItem(context, null) }
+                        deviceLibrary.albums.map { it.toMediaItem(context) }
                     MediaSessionUID.Category.ARTISTS ->
-                        deviceLibrary.artists.map { it.toMediaItem(context, null) }
+                        deviceLibrary.artists.map { it.toMediaItem(context) }
                     MediaSessionUID.Category.GENRES ->
                         deviceLibrary.genres.map { it.toMediaItem(context) }
                     MediaSessionUID.Category.PLAYLISTS ->
@@ -130,12 +130,14 @@ constructor(
                 }
             }
             is MediaSessionUID.Single -> {
-                getChildMediaItems(mediaSessionUID.uid) ?: return null
+                getChildMediaItems(mediaSessionUID.uid)
             }
             is MediaSessionUID.Joined -> {
-                getChildMediaItems(mediaSessionUID.childUid) ?: return null
+                getChildMediaItems(mediaSessionUID.childUid)
+            }
+            null -> {
+                return null
             }
-            null -> return null
         }
     }
 
@@ -145,7 +147,7 @@ constructor(
                 item.songs.map { it.toMediaItem(context, item) }
             }
             is Artist -> {
-                (item.explicitAlbums + item.implicitAlbums).map { it.toMediaItem(context, item) } +
+                (item.explicitAlbums + item.implicitAlbums).map { it.toMediaItem(context) } +
                     item.songs.map { it.toMediaItem(context, item) }
             }
             is Genre -> {
@@ -202,10 +204,10 @@ constructor(
             music.addAll(songs.map { it.toMediaItem(context, null) })
         }
         if (albums != null) {
-            music.addAll(albums.map { it.toMediaItem(context, null) })
+            music.addAll(albums.map { it.toMediaItem(context) })
         }
         if (artists != null) {
-            music.addAll(artists.map { it.toMediaItem(context, null) })
+            music.addAll(artists.map { it.toMediaItem(context) })
         }
         if (genres != null) {
             music.addAll(genres.map { it.toMediaItem(context) })