diff --git a/src/frontend/src/pages/GanttPage/GanttChart/GanttChart.tsx b/src/frontend/src/pages/GanttPage/GanttChart/GanttChart.tsx
index 9e7c6c9805..4a1a665c9f 100644
--- a/src/frontend/src/pages/GanttPage/GanttChart/GanttChart.tsx
+++ b/src/frontend/src/pages/GanttPage/GanttChart/GanttChart.tsx
@@ -67,20 +67,21 @@ const GanttChart = <E, T>({
     >
       <GanttChartTimeline start={startDate} end={endDate} />
       <Box sx={{ position: 'relative' }}>
-        {collections.map((collection) => {
-          return collection.tasks ? (
-            <GanttChartCollectionSection
-              startDate={startDate}
-              endDate={endDate}
-              collection={collection}
-              shouldShowChildren={shouldShowChildren}
-              onShowChildrenToggle={onShowChildrenToggle}
-              editability={editability}
-            />
-          ) : (
-            <></>
-          );
-        })}
+        {collections
+          .filter((collection) => collection.tasks.length > 0)
+          .map((collection) => {
+            return (
+              <GanttChartCollectionSection
+                key={collection.id}
+                startDate={startDate}
+                endDate={endDate}
+                collection={collection}
+                shouldShowChildren={shouldShowChildren}
+                onShowChildrenToggle={onShowChildrenToggle}
+                editability={editability}
+              />
+            );
+          })}
 
         {currentWeekCol > 0 && (
           <Box
diff --git a/src/frontend/src/pages/GanttPage/GanttChart/GanttChartSection.tsx b/src/frontend/src/pages/GanttPage/GanttChart/GanttChartSection.tsx
index a42ea71867..6328d040f4 100644
--- a/src/frontend/src/pages/GanttPage/GanttChart/GanttChartSection.tsx
+++ b/src/frontend/src/pages/GanttPage/GanttChart/GanttChartSection.tsx
@@ -68,9 +68,8 @@ const GanttChartSection = <T,>({
       <Box sx={{ mt: '1rem', width: 'fit-content' }}>
         {tasks.map((task) => {
           return (
-            <Box display="flex" alignItems="center">
+            <Box key={task.id} display="flex" alignItems="center">
               <GanttTaskBar
-                key={task.id}
                 days={days}
                 task={task}
                 isEditMode={isEditMode}