diff --git a/packages/components/src/components/marquee/index.tsx b/packages/components/src/components/marquee/index.tsx
index 21a0e5180..aab95a8bc 100644
--- a/packages/components/src/components/marquee/index.tsx
+++ b/packages/components/src/components/marquee/index.tsx
@@ -110,7 +110,11 @@ export function MarqueeRows({
   const chunks: ReactElement[][] = [];
 
   for (let i = 0; i < rows; i++) {
-    chunks.push(children.slice(i * chunkSize, (i + 1) * chunkSize));
+    const chunk = children.slice(i * chunkSize, (i + 1) * chunkSize);
+
+    if (chunk.length !== 0) {
+      chunks.push(chunk);
+    }
   }
 
   return (
diff --git a/packages/components/src/components/marquee/marquee.stories.tsx b/packages/components/src/components/marquee/marquee.stories.tsx
index 8f2968fcb..839568dcd 100644
--- a/packages/components/src/components/marquee/marquee.stories.tsx
+++ b/packages/components/src/components/marquee/marquee.stories.tsx
@@ -3,7 +3,7 @@ import { hiveThemeDecorator } from '../../../../../.storybook/hive-theme-decorat
 import { Marquee, MarqueeProps, MarqueeRows, MarqueeRowsProps } from './index';
 
 export default {
-  title: 'Marquee',
+  title: 'Components/Marquee',
   component: Marquee,
   decorators: [hiveThemeDecorator],
   parameters: {