diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index 51b68f7bb..96afe70c7 100644
--- a/ui/src/album/AlbumSongs.js
+++ b/ui/src/album/AlbumSongs.js
@@ -82,9 +82,11 @@ const AlbumSongs = (props) => {
 
   let multiDisc = false
   if (loaded) {
-    const discSet = new Set()
-    ids.forEach((id) => discSet.add(data[id].discNumber))
-    multiDisc = discSet.size > 1
+    const discNumbers = ids
+      .map((id) => data[id])
+      .filter((r) => r)
+      .map((r) => r.discNumber)
+    multiDisc = new Set(discNumbers).size > 1
   }
 
   const anySong = data[ids[0]]