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 37a9897..4476ba7 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
@@ -205,7 +205,7 @@ fun ArtistScreen(
                                     .clickable {
                                         binder?.playRadio(
                                             NavigationEndpoint.Endpoint.Watch(
-                                                videoId = artist.radioVideoId,
+                                                videoId = artist.radioVideoId ?: artist.shuffleVideoId,
                                                 playlistId = artist.radioPlaylistId
                                             )
                                         )