diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index 44b40738e..4a821355c 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -398,25 +398,21 @@ export const AlbumDetailContent = ({ background }: AlbumDetailContentProps) => {
 
                 <Stack gap="lg" mt="3rem">
                     {cq.height || cq.width ? (
-                        <>
+                        <Suspense fallback={<Spinner container />}>
                             {carousels
                                 .filter((c) => !c.isHidden)
                                 .map((carousel) => (
-                                    <Suspense
-                                        fallback={<Spinner container />}
+                                    <AlbumInfiniteCarousel
+                                        excludeIds={carousel.excludeIds}
                                         key={`carousel-${carousel.uniqueId}`}
-                                    >
-                                        <AlbumInfiniteCarousel
-                                            excludeIds={carousel.excludeIds}
-                                            query={carousel.query}
-                                            rowCount={1}
-                                            sortBy={carousel.sortBy}
-                                            sortOrder={carousel.sortOrder}
-                                            title={carousel.title}
-                                        />
-                                    </Suspense>
+                                        query={carousel.query}
+                                        rowCount={1}
+                                        sortBy={carousel.sortBy}
+                                        sortOrder={carousel.sortOrder}
+                                        title={carousel.title}
+                                    />
                                 ))}
-                        </>
+                        </Suspense>
                     ) : null}
                 </Stack>
             </div>
diff --git a/src/renderer/features/albums/components/album-infinite-carousel.tsx b/src/renderer/features/albums/components/album-infinite-carousel.tsx
index 57716ba4f..c769b5193 100644
--- a/src/renderer/features/albums/components/album-infinite-carousel.tsx
+++ b/src/renderer/features/albums/components/album-infinite-carousel.tsx
@@ -27,7 +27,7 @@ interface AlbumCarouselProps {
     title: React.ReactNode | string;
 }
 
-export function AlbumInfiniteCarousel(props: AlbumCarouselProps) {
+const BaseAlbumInfiniteCarousel = (props: AlbumCarouselProps) => {
     const { excludeIds, query: additionalQuery, rowCount = 1, sortBy, sortOrder, title } = props;
     const rows = useGridRows(LibraryItem.ALBUM, ItemListKey.ALBUM);
     const {
@@ -84,7 +84,11 @@ export function AlbumInfiniteCarousel(props: AlbumCarouselProps) {
             title={title}
         />
     );
-}
+};
+
+export const AlbumInfiniteCarousel = (props: AlbumCarouselProps) => {
+    return <BaseAlbumInfiniteCarousel {...props} />;
+};
 
 function useAlbumListInfinite(
     sortBy: AlbumListSort,
diff --git a/src/renderer/features/artists/components/album-artist-infinite-carousel.tsx b/src/renderer/features/artists/components/album-artist-infinite-carousel.tsx
index 3a5208d36..fe926b1dd 100644
--- a/src/renderer/features/artists/components/album-artist-infinite-carousel.tsx
+++ b/src/renderer/features/artists/components/album-artist-infinite-carousel.tsx
@@ -27,7 +27,7 @@ interface AlbumArtistCarouselProps {
     title: React.ReactNode | string;
 }
 
-export function AlbumArtistInfiniteCarousel(props: AlbumArtistCarouselProps) {
+export const BaseAlbumArtistInfiniteCarousel = (props: AlbumArtistCarouselProps) => {
     const { excludeIds, query: additionalQuery, rowCount = 1, sortBy, sortOrder, title } = props;
     const rows = useGridRows(LibraryItem.ALBUM_ARTIST, ItemListKey.ALBUM_ARTIST);
     const {
@@ -86,7 +86,11 @@ export function AlbumArtistInfiniteCarousel(props: AlbumArtistCarouselProps) {
             title={title}
         />
     );
-}
+};
+
+export const AlbumArtistInfiniteCarousel = (props: AlbumArtistCarouselProps) => {
+    return <BaseAlbumArtistInfiniteCarousel {...props} />;
+};
 
 function useAlbumArtistListInfinite(
     sortBy: AlbumArtistListSort,