diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/Database.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/Database.kt
index 00b344a..ee9e149 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/Database.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/Database.kt
@@ -121,10 +121,10 @@ interface Database {
     @Query("SELECT thumbnailUrl FROM Song JOIN SongInPlaylist ON id = songId WHERE playlistId = :id ORDER BY position LIMIT 4")
     fun playlistThumbnailUrls(id: Long): Flow<List<String?>>
 
-//    @Transaction
-//    @RewriteQueriesToDropUnusedColumns
-//    @Query("SELECT * FROM Info JOIN SongWithAuthors ON Info.id = SongWithAuthors.authorInfoId JOIN Song ON SongWithAuthors.songId = Song.id WHERE browseId = :artistId ORDER BY Song.ROWID DESC")
-//    fun artistSongs(artistId: String): Flow<List<DetailedSong>>
+    @Transaction
+    @Query("SELECT * FROM Song JOIN SongArtistMap ON Song.id = SongArtistMap.songId WHERE SongArtistMap.artistId = :artistId ORDER BY Song.ROWID DESC")
+    @RewriteQueriesToDropUnusedColumns
+    fun artistSongs(artistId: String): Flow<List<DetailedSong>>
 
     @Insert(onConflict = OnConflictStrategy.ABORT)
     fun insertQueue(queuedMediaItems: List<QueuedMediaItem>)
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt
index b20296b..eb7dcae 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/ArtistScreen.kt
@@ -97,9 +97,8 @@ fun ArtistScreen(
             }
 
             val songs by remember(browseId) {
-                flowOf(emptyList<DetailedSong>())
-//                Database.artistSongs(browseId)
-            }.collectAsState(initial = emptyList<DetailedSong>(), context = Dispatchers.IO)
+                Database.artistSongs(browseId)
+            }.collectAsState(initial = emptyList(), context = Dispatchers.IO)
 
             LazyColumn(
                 state = lazyListState,
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
index fad94ca..3e1c3b6 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
@@ -458,8 +458,7 @@ fun PlayerView(
             )
 
             BasicText(
-                text = playerState.mediaMetadata.extras?.getStringArrayList("artistNames")
-                    ?.joinToString("") ?: "",
+                text = playerState.mediaMetadata.artist?.toString() ?: "",
                 style = typography.s.semiBold.secondary,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,