diff --git a/ui/src/album/AlbumShow.js b/ui/src/album/AlbumShow.js
index 24bcf874f..a8b7c21cd 100644
--- a/ui/src/album/AlbumShow.js
+++ b/ui/src/album/AlbumShow.js
@@ -24,6 +24,7 @@ const AlbumShow = (props) => {
       <AlbumDetails {...props} classes={classes} record={record} />
       <AlbumSongs
         {...props}
+        albumId={props.id}
         title={<Title subTitle={record.name} />}
         actions={<AlbumActions />}
         filter={{ album_id: props.id }}
diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.js
index ff1f283ae..b502f417e 100644
--- a/ui/src/album/AlbumSongs.js
+++ b/ui/src/album/AlbumSongs.js
@@ -58,12 +58,16 @@ const AlbumSongs = (props) => {
   const dispatch = useDispatch()
   const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
   const controllerProps = useListController(props)
-  const { bulkActionButtons } = props
-  const { loading, version } = controllerProps
+  const { bulkActionButtons, albumId } = props
+  const { loading, data, ids, version } = controllerProps
 
   if (loading) {
-    return null
+    const anySong = data[ids[0]]
+    if (!anySong || anySong.albumId !== albumId) {
+      return null
+    }
   }
+
   return (
     <>
       <ListToolbar