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