diff --git a/web-src/src/components/ModalDialogAlbumSpotify.vue b/web-src/src/components/ModalDialogAlbumSpotify.vue
index 55560f89..55b95667 100644
--- a/web-src/src/components/ModalDialogAlbumSpotify.vue
+++ b/web-src/src/components/ModalDialogAlbumSpotify.vue
@@ -7,7 +7,7 @@
           <div class="card">
             <div class="card-content">
               <cover-artwork
-                :artwork_url="artwork_url"
+                :artwork_url="artwork_url(album)"
                 :artist="album.artist"
                 :album="album.name"
                 class="fd-has-shadow fd-cover fd-cover-normal-image mb-5"
@@ -104,11 +104,8 @@ export default {
   },
 
   computed: {
-    artwork_url() {
-      if (this.album.images && this.album.images.length > 0) {
-        return this.album.images[0].url
-      }
-      return ''
+    artwork_url(album) {
+      return album.images?.[0]?.url || ''
     }
   },
 
diff --git a/web-src/src/pages/PageAlbumSpotify.vue b/web-src/src/pages/PageAlbumSpotify.vue
index e34ca9c5..db071cef 100644
--- a/web-src/src/pages/PageAlbumSpotify.vue
+++ b/web-src/src/pages/PageAlbumSpotify.vue
@@ -25,7 +25,7 @@
       </template>
       <template #heading-right>
         <cover-artwork
-          :artwork_url="artwork_url"
+          :artwork_url="artwork_url(album)"
           :artist="album.artist"
           :album="album.name"
           class="is-clickable fd-has-shadow fd-cover fd-cover-medium-image"
@@ -129,11 +129,8 @@ export default {
   },
 
   computed: {
-    artwork_url() {
-      if (this.album.images && this.album.images.length > 0) {
-        return this.album.images[0].url
-      }
-      return ''
+    artwork_url(album) {
+      return album.images?.[0]?.url || ''
     }
   },
 
diff --git a/web-src/src/pages/PageMusicSpotify.vue b/web-src/src/pages/PageMusicSpotify.vue
index 125a44d7..3b0bc4e9 100644
--- a/web-src/src/pages/PageMusicSpotify.vue
+++ b/web-src/src/pages/PageMusicSpotify.vue
@@ -211,10 +211,7 @@ export default {
     },
 
     artwork_url(album) {
-      if (album.images && album.images.length > 0) {
-        return album.images[0].url
-      }
-      return ''
+      return album.images?.[0]?.url || ''
     }
   }
 }
diff --git a/web-src/src/pages/PageMusicSpotifyNewReleases.vue b/web-src/src/pages/PageMusicSpotifyNewReleases.vue
index 27d66925..8b108805 100644
--- a/web-src/src/pages/PageMusicSpotifyNewReleases.vue
+++ b/web-src/src/pages/PageMusicSpotifyNewReleases.vue
@@ -128,10 +128,7 @@ export default {
     },
 
     artwork_url(album) {
-      if (album.images && album.images.length > 0) {
-        return album.images[0].url
-      }
-      return ''
+      return album.images?.[0]?.url || ''
     }
   }
 }
diff --git a/web-src/src/pages/PageSearchSpotify.vue b/web-src/src/pages/PageSearchSpotify.vue
index 78efbee9..7e30502b 100644
--- a/web-src/src/pages/PageSearchSpotify.vue
+++ b/web-src/src/pages/PageSearchSpotify.vue
@@ -405,10 +405,7 @@ export default {
 
   methods: {
     artwork_url(album) {
-      if (album.images && album.images.length > 0) {
-        return album.images[0].url
-      }
-      return ''
+      return album.images?.[0]?.url || ''
     },
     new_search() {
       if (!this.search_query) {