diff --git a/plugins/home/src/homePageComponents/StarredEntities/Content.tsx b/plugins/home/src/homePageComponents/StarredEntities/Content.tsx
index e98065b392..ed5eec857b 100644
--- a/plugins/home/src/homePageComponents/StarredEntities/Content.tsx
+++ b/plugins/home/src/homePageComponents/StarredEntities/Content.tsx
@@ -135,25 +135,26 @@ export const Content = ({
         </Tabs>
       )}
 
-      {groupByKindEntries.map(([kind, entitiesByKind], index) => (
-        <div key={kind} hidden={groupByKind && activeTab !== index}>
-          <List>
-            {entitiesByKind
-              ?.sort((a, b) =>
-                (a.metadata.title ?? a.metadata.name).localeCompare(
-                  b.metadata.title ?? b.metadata.name,
-                ),
-              )
-              .map(entity => (
-                <StarredEntityListItem
-                  key={stringifyEntityRef(entity)}
-                  entity={entity}
-                  onToggleStarredEntity={toggleStarredEntity}
-                />
-              ))}
-          </List>
-        </div>
-      ))}
+      {groupByKind &&
+        groupByKindEntries.map(([kind, entitiesByKind], index) => (
+          <div key={kind} hidden={groupByKind && activeTab !== index}>
+            <List>
+              {entitiesByKind
+                ?.sort((a, b) =>
+                  (a.metadata.title ?? a.metadata.name).localeCompare(
+                    b.metadata.title ?? b.metadata.name,
+                  ),
+                )
+                .map(entity => (
+                  <StarredEntityListItem
+                    key={stringifyEntityRef(entity)}
+                    entity={entity}
+                    onToggleStarredEntity={toggleStarredEntity}
+                  />
+                ))}
+            </List>
+          </div>
+        ))}
     </div>
   );
 };