diff --git a/app/src/main/kotlin/com/subtracks/ui/components/Components.kt b/app/src/main/kotlin/com/subtracks/ui/components/Components.kt
index 13741d92..6bfb1a9b 100644
--- a/app/src/main/kotlin/com/subtracks/ui/components/Components.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/components/Components.kt
@@ -33,8 +33,8 @@ fun CoverArt(
     showPlaceholder: Boolean = true,
 ) {
     val context = LocalPlatformContext.current
-    var failed by remember(ref) { mutableStateOf(false) }
-    var thumbnailLoaded by remember(thumbnailRef) { mutableStateOf(false) }
+    var failed by remember(ref, thumbnailRef) { mutableStateOf(false) }
+    var thumbnailLoaded by remember(ref, thumbnailRef) { mutableStateOf(false) }
     Box(modifier = modifier.background(MaterialTheme.colorScheme.surfaceVariant)) {
         if (showPlaceholder || (failed && !thumbnailLoaded)) {
             Text(
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailViewModel.kt b/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailViewModel.kt
index d41f8c0e..1252aa8e 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailViewModel.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailViewModel.kt
@@ -48,6 +48,7 @@ class ArtistDetailViewModel(
     }
 
     private suspend fun resolveArt(artist: Artist): Pair<CoverArtRef?, CoverArtRef?> {
+        if (artist.coverArt == null) return null to null
         repeat(3) { attempt ->
             val full = sourceRepository.coverArt(artist.coverArt)
             if (full != null) {
diff --git a/app/src/main/kotlin/com/subtracks/ui/playback/MiniPlayer.kt b/app/src/main/kotlin/com/subtracks/ui/playback/MiniPlayer.kt
index 052aec17..7419bed9 100644
--- a/app/src/main/kotlin/com/subtracks/ui/playback/MiniPlayer.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/playback/MiniPlayer.kt
@@ -81,7 +81,7 @@ fun MiniPlayer(
                         modifier = Modifier.basicMarquee(),
                     )
                     Text(
-                        text = item.artist.orEmpty(),
+                        text = item.artist ?: item.album.orEmpty(),
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
                         maxLines = 1,