diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/album/AlbumDetails.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/album/AlbumDetails.kt
index 71f62810e7..bf58d298dc 100644
--- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/album/AlbumDetails.kt
+++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/album/AlbumDetails.kt
@@ -1112,7 +1112,7 @@ fun AlbumDetails(
                         var forceRecompose by remember { mutableStateOf(false) }
                         SongItem(
                             mediaItem = song.asMediaItem,
-                            downloadState = downloadState,
+                            downloadState = getDownloadState(song.asMediaItem.mediaId),
                             onDownloadClick = {
                                 binder?.cache?.removeResource(song.asMediaItem.mediaId)
                                 Database.asyncTransaction {
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/artist/ArtistOverviewItems.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/artist/ArtistOverviewItems.kt
index bf8887988c..fb10792f00 100644
--- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/artist/ArtistOverviewItems.kt
+++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/artist/ArtistOverviewItems.kt
@@ -294,7 +294,7 @@ fun ArtistOverviewItems(
                                     thumbnailContent = {
                                         NowPlayingSongIndicator(item.asMediaItem.mediaId, binder?.player)
                                     },
-                                    downloadState = downloadState,
+                                    downloadState = getDownloadState(item.asMediaItem.mediaId),
                                     thumbnailSizeDp = songThumbnailSizeDp,
                                     thumbnailSizePx = songThumbnailSizePx,
                                     modifier = Modifier
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/playlist/PlaylistSongList.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/playlist/PlaylistSongList.kt
index 42a0676ade..d28358897e 100644
--- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/playlist/PlaylistSongList.kt
+++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/playlist/PlaylistSongList.kt
@@ -821,7 +821,7 @@ fun PlaylistSongList(
                                         downloadState = isDownloaded
                                     )
                             },
-                            downloadState = downloadState,
+                            downloadState = getDownloadState(song.asMediaItem.mediaId),
                             thumbnailSizePx = songThumbnailSizePx,
                             thumbnailSizeDp = songThumbnailSizeDp,
                             modifier = Modifier