diff --git a/public/app/features/browse-dashboards/components/TagsCell.tsx b/public/app/features/browse-dashboards/components/TagsCell.tsx
index 52c279dce36..cb82a101949 100644
--- a/public/app/features/browse-dashboards/components/TagsCell.tsx
+++ b/public/app/features/browse-dashboards/components/TagsCell.tsx
@@ -10,11 +10,11 @@ import { DashboardsTreeItem } from '../types';
 export function TagsCell({ row: { original: data } }: CellProps<DashboardsTreeItem, unknown>) {
   const styles = useStyles2(getStyles);
   const item = data.item;
-  if (item.kind === 'ui-empty-folder') {
-    return <></>;
+  if (item.kind === 'ui-empty-folder' || !item.tags) {
+    return null;
   }
 
-  return <TagList className={styles.tagList} tags={item.tags ?? []} />;
+  return <TagList className={styles.tagList} tags={item.tags} />;
 }
 
 function getStyles(theme: GrafanaTheme2) {