diff --git a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
index 35a56bc2..da580555 100644
--- a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
+++ b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
@@ -21,6 +21,7 @@ interface VirtualGridProps extends Omit<FixedSizeListProps, 'children' | 'itemSi
   itemGap: number;
   itemSize: number;
   itemType: LibraryItem;
+  loading?: boolean;
   minimumBatchSize?: number;
   route?: CardRoute;
   setItemData: (data: any[]) => void;
@@ -50,6 +51,7 @@ export const VirtualInfiniteGrid = forwardRef(
       handlePlayQueueAdd,
       minimumBatchSize,
       fetchFn,
+      loading,
       initialScrollOffset,
       height,
       width,
@@ -126,41 +128,45 @@ export const VirtualInfiniteGrid = forwardRef(
       },
     }));
 
+    if (loading) return null;
+
     return (
-      <InfiniteLoader
-        ref={loader}
-        isItemLoaded={(index) => isItemLoaded(index)}
-        itemCount={itemCount || 0}
-        loadMoreItems={debouncedLoadMoreItems}
-        minimumBatchSize={minimumBatchSize}
-        threshold={30}
-      >
-        {({ onItemsRendered, ref: infiniteLoaderRef }) => (
-          <VirtualGridWrapper
-            cardRows={cardRows}
-            columnCount={columnCount}
-            display={display || ListDisplayType.CARD}
-            handlePlayQueueAdd={handlePlayQueueAdd}
-            height={height}
-            initialScrollOffset={initialScrollOffset}
-            itemCount={itemCount || 0}
-            itemData={itemData}
-            itemGap={itemGap}
-            itemHeight={itemHeight + itemGap / 2}
-            itemType={itemType}
-            itemWidth={itemSize}
-            refInstance={(list) => {
-              infiniteLoaderRef(list);
-              listRef.current = list;
-            }}
-            route={route}
-            rowCount={rowCount}
-            width={width}
-            onItemsRendered={onItemsRendered}
-            onScroll={onScroll}
-          />
-        )}
-      </InfiniteLoader>
+      <>
+        <InfiniteLoader
+          ref={loader}
+          isItemLoaded={(index) => isItemLoaded(index)}
+          itemCount={itemCount || 0}
+          loadMoreItems={debouncedLoadMoreItems}
+          minimumBatchSize={minimumBatchSize}
+          threshold={30}
+        >
+          {({ onItemsRendered, ref: infiniteLoaderRef }) => (
+            <VirtualGridWrapper
+              cardRows={cardRows}
+              columnCount={columnCount}
+              display={display || ListDisplayType.CARD}
+              handlePlayQueueAdd={handlePlayQueueAdd}
+              height={height}
+              initialScrollOffset={initialScrollOffset}
+              itemCount={itemCount || 0}
+              itemData={itemData}
+              itemGap={itemGap}
+              itemHeight={itemHeight + itemGap / 2}
+              itemType={itemType}
+              itemWidth={itemSize}
+              refInstance={(list) => {
+                infiniteLoaderRef(list);
+                listRef.current = list;
+              }}
+              route={route}
+              rowCount={rowCount}
+              width={width}
+              onItemsRendered={onItemsRendered}
+              onScroll={onScroll}
+            />
+          )}
+        </InfiniteLoader>
+      </>
     );
   },
 );
diff --git a/src/renderer/features/albums/components/album-list-content.tsx b/src/renderer/features/albums/components/album-list-content.tsx
index 2b5b9113..55b6b3d8 100644
--- a/src/renderer/features/albums/components/album-list-content.tsx
+++ b/src/renderer/features/albums/components/album-list-content.tsx
@@ -312,29 +312,32 @@ export const AlbumListContent = ({ gridRef, tableRef }: AlbumListContentProps) =
         {page.display === ListDisplayType.CARD || page.display === ListDisplayType.POSTER ? (
           <AutoSizer>
             {({ height, width }) => (
-              <VirtualInfiniteGrid
-                key={`album-list-${server?.id}-${page.display}`}
-                ref={gridRef}
-                cardRows={cardRows}
-                display={page.display || ListDisplayType.CARD}
-                fetchFn={fetch}
-                handlePlayQueueAdd={handlePlayQueueAdd}
-                height={height}
-                initialScrollOffset={page?.grid.scrollOffset || 0}
-                itemCount={checkAlbumList?.data?.totalRecordCount || 0}
-                itemData={itemData}
-                itemGap={20}
-                itemSize={150 + page.grid?.size}
-                itemType={LibraryItem.ALBUM}
-                minimumBatchSize={40}
-                route={{
-                  route: AppRoute.LIBRARY_ALBUMS_DETAIL,
-                  slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
-                }}
-                setItemData={setItemData}
-                width={width}
-                onScroll={handleGridScroll}
-              />
+              <>
+                <VirtualInfiniteGrid
+                  key={`album-list-${server?.id}-${page.display}`}
+                  ref={gridRef}
+                  cardRows={cardRows}
+                  display={page.display || ListDisplayType.CARD}
+                  fetchFn={fetch}
+                  handlePlayQueueAdd={handlePlayQueueAdd}
+                  height={height}
+                  initialScrollOffset={page?.grid.scrollOffset || 0}
+                  itemCount={checkAlbumList?.data?.totalRecordCount || 0}
+                  itemData={itemData}
+                  itemGap={20}
+                  itemSize={150 + page.grid?.size}
+                  itemType={LibraryItem.ALBUM}
+                  loading={checkAlbumList.isLoading}
+                  minimumBatchSize={40}
+                  route={{
+                    route: AppRoute.LIBRARY_ALBUMS_DETAIL,
+                    slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
+                  }}
+                  setItemData={setItemData}
+                  width={width}
+                  onScroll={handleGridScroll}
+                />
+              </>
             )}
           </AutoSizer>
         ) : (
diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx
index c5e79765..dc04571d 100644
--- a/src/renderer/features/artists/components/album-artist-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-content.tsx
@@ -306,6 +306,7 @@ export const AlbumArtistListContent = ({ gridRef, tableRef }: AlbumArtistListCon
                 itemGap={20}
                 itemSize={150 + page.grid?.size}
                 itemType={LibraryItem.ALBUM_ARTIST}
+                loading={checkAlbumArtistList.isLoading}
                 minimumBatchSize={40}
                 route={{
                   route: AppRoute.LIBRARY_ALBUMARTISTS_DETAIL,