diff --git a/android/app/src/main/java/com/fabledsword/minstrel/library/ui/ArtistDetailScreen.kt b/android/app/src/main/java/com/fabledsword/minstrel/library/ui/ArtistDetailScreen.kt
index 49ee5b2e..01fa2b7e 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/library/ui/ArtistDetailScreen.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/library/ui/ArtistDetailScreen.kt
@@ -48,6 +48,7 @@ import com.composables.icons.lucide.User
 import com.fabledsword.minstrel.library.widgets.AlbumCard
 import com.fabledsword.minstrel.models.ArtistDetailRef
 import com.fabledsword.minstrel.models.ArtistRef
+import com.fabledsword.minstrel.models.albumCoverPath
 import com.fabledsword.minstrel.nav.AlbumDetail
 import com.fabledsword.minstrel.shared.widgets.EmptyState
 import com.fabledsword.minstrel.shared.widgets.LikeButton
@@ -205,7 +206,7 @@ private fun ArtistAvatar(artist: ArtistRef, fallbackAlbumId: String? = null) {
     // _ArtistAvatar). Bare Lucide.User only when neither exists.
     val model = when {
         artist.coverUrl.isNotEmpty() -> artist.coverUrl
-        fallbackAlbumId != null -> "/api/albums/$fallbackAlbumId/cover"
+        fallbackAlbumId != null -> albumCoverPath(fallbackAlbumId)
         else -> null
     }
     Box(
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/models/AlbumRef.kt b/android/app/src/main/java/com/fabledsword/minstrel/models/AlbumRef.kt
index e432e5b7..a58369de 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/models/AlbumRef.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/models/AlbumRef.kt
@@ -32,5 +32,5 @@ data class AlbumRef(
      * grid, Home rows on cold-start) would show no artwork at all.
      */
     val displayCoverUrl: String
-        get() = coverUrl.ifEmpty { "http://placeholder.invalid/api/albums/$id/cover" }
+        get() = coverUrl.ifEmpty { albumCoverPath(id) }
 }
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/models/ArtistRef.kt b/android/app/src/main/java/com/fabledsword/minstrel/models/ArtistRef.kt
index 010d6ca3..94b78166 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/models/ArtistRef.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/models/ArtistRef.kt
@@ -30,7 +30,7 @@ data class ArtistRef(
     val displayCoverUrl: String?
         get() = when {
             coverUrl.isNotEmpty() -> coverUrl
-            coverAlbumId.isNotEmpty() -> "/api/albums/$coverAlbumId/cover"
+            coverAlbumId.isNotEmpty() -> albumCoverPath(coverAlbumId)
             else -> null
         }
 }
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/models/Playlist.kt b/android/app/src/main/java/com/fabledsword/minstrel/models/Playlist.kt
index 17e7bb4c..a4610c05 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/models/Playlist.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/models/Playlist.kt
@@ -62,7 +62,5 @@ data class PlaylistTrackRef(
      * whose upstream album was deleted).
      */
     val coverUrl: String
-        get() = albumId?.takeIf { it.isNotEmpty() }
-            ?.let { "http://placeholder.invalid/api/albums/$it/cover" }
-            .orEmpty()
+        get() = albumCoverPath(albumId.orEmpty())
 }
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/models/QuarantineRef.kt b/android/app/src/main/java/com/fabledsword/minstrel/models/QuarantineRef.kt
index 80635aaa..b18cef97 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/models/QuarantineRef.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/models/QuarantineRef.kt
@@ -36,5 +36,5 @@ data class QuarantineRef(
      * Empty when the row has no album binding (rare).
      */
     val coverUrl: String
-        get() = if (albumId.isEmpty()) "" else "http://placeholder.invalid/api/albums/$albumId/cover"
+        get() = albumCoverPath(albumId)
 }
diff --git a/android/app/src/main/java/com/fabledsword/minstrel/models/TrackRef.kt b/android/app/src/main/java/com/fabledsword/minstrel/models/TrackRef.kt
index 8e039f15..345d0137 100644
--- a/android/app/src/main/java/com/fabledsword/minstrel/models/TrackRef.kt
+++ b/android/app/src/main/java/com/fabledsword/minstrel/models/TrackRef.kt
@@ -41,5 +41,5 @@ data class TrackRef(
      * branch on isEmpty to show the placeholder icon.
      */
     val coverUrl: String
-        get() = if (albumId.isEmpty()) "" else "http://placeholder.invalid/api/albums/$albumId/cover"
+        get() = albumCoverPath(albumId)
 }