diff --git a/apps/web/features/layout/components/MerchLayout.tsx b/apps/web/features/layout/components/MerchLayout.tsx
index cb5fa449..ba791abc 100644
--- a/apps/web/features/layout/components/MerchLayout.tsx
+++ b/apps/web/features/layout/components/MerchLayout.tsx
@@ -20,11 +20,7 @@ export const MerchLayout = ({ children }: MerchLayoutProps) => {
   const disabled = status?.disabled;
 
   if (isStatusLoading) {
-    return (
-      <Page>
-        <MerchListSkeleton />
-      </Page>
-    );
+    return <Page>{<MerchListSkeleton /> ?? <></>}</Page>;
   }
 
   return (
diff --git a/packages/ui/components/merch/skeleton/MerchListSkeleton.tsx b/packages/ui/components/merch/skeleton/MerchListSkeleton.tsx
index 744a7292..ff40733f 100644
--- a/packages/ui/components/merch/skeleton/MerchListSkeleton.tsx
+++ b/packages/ui/components/merch/skeleton/MerchListSkeleton.tsx
@@ -8,7 +8,7 @@ export const MerchListSkeleton: React.FC = () => {
       columnGap={4}
       rowGap={2}
     >
-      {Array.from({ length: 8 }, (_, i) => (
+      {new Array(8).fill(null).map((_, i: number) => (
         <GridItem role="group" cursor="pointer" mt={4} key={i}>
           <Skeleton h={{ base: 250 }} width="100%" />
           <SkeletonText mt={4} noOfLines={2} spacing="4" />