diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index 6b6e1a787..05a785017 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -186,7 +186,8 @@ const LoadedAlbumGrid = ({ ids, data, basePath, width }) => {
 }
 
 const AlbumGridView = ({ albumListType, loaded, loading, ...props }) => {
-  const hide = (loading && albumListType === 'random') || !props.data
+  const hide =
+    (loading && albumListType === 'random') || !props.data || !props.ids
   return hide ? <Loading /> : <LoadedAlbumGrid {...props} />
 }