diff --git a/packages/react-ui/src/genui-lib/Charts/AreaChartCondensed.ts b/packages/react-ui/src/genui-lib/Charts/AreaChartCondensed.ts
index 93fba7703..c4b75ead6 100644
--- a/packages/react-ui/src/genui-lib/Charts/AreaChartCondensed.ts
+++ b/packages/react-ui/src/genui-lib/Charts/AreaChartCondensed.ts
@@ -21,7 +21,7 @@ export const AreaChartCondensed = defineComponent({
   description: "Filled area under lines; use for cumulative totals or volume trends over time",
   component: ({ props }) => {
     if (!hasAllProps(props as Record<string, unknown>, "labels", "series")) return null;
-    const data = buildChartData(props.labels, props.series);
+    const data = buildChartData(props.labels, props.series) ?? [];
     if (!data.length) return null;
     return React.createElement(AreaChartCondensedComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/BarChartCondensed.ts b/packages/react-ui/src/genui-lib/Charts/BarChartCondensed.ts
index 803ac48ee..974e743b4 100644
--- a/packages/react-ui/src/genui-lib/Charts/BarChartCondensed.ts
+++ b/packages/react-ui/src/genui-lib/Charts/BarChartCondensed.ts
@@ -21,7 +21,7 @@ export const BarChartCondensed = defineComponent({
   description: "Vertical bars; use for comparing values across categories with one or more series",
   component: ({ props }) => {
     if (!hasAllProps(props as Record<string, unknown>, "labels", "series")) return null;
-    const data = buildChartData(props.labels, props.series);
+    const data = buildChartData(props.labels, props.series) ?? [];
     if (!data.length) return null;
     return React.createElement(BarChartCondensedComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/HorizontalBarChart.ts b/packages/react-ui/src/genui-lib/Charts/HorizontalBarChart.ts
index b927124c4..bc70c2d07 100644
--- a/packages/react-ui/src/genui-lib/Charts/HorizontalBarChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/HorizontalBarChart.ts
@@ -21,7 +21,7 @@ export const HorizontalBarChart = defineComponent({
   description: "Horizontal bars; prefer when category labels are long or for ranked lists",
   component: ({ props }) => {
     if (!hasAllProps(props as Record<string, unknown>, "labels", "series")) return null;
-    const data = buildChartData(props.labels, props.series);
+    const data = buildChartData(props.labels, props.series) ?? [];
     if (!data.length) return null;
     return React.createElement(HorizontalBarChartComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/LineChartCondensed.ts b/packages/react-ui/src/genui-lib/Charts/LineChartCondensed.ts
index f1c578ba9..ad8f2db3f 100644
--- a/packages/react-ui/src/genui-lib/Charts/LineChartCondensed.ts
+++ b/packages/react-ui/src/genui-lib/Charts/LineChartCondensed.ts
@@ -21,7 +21,7 @@ export const LineChartCondensed = defineComponent({
   description: "Lines over categories; use for trends and continuous data over time",
   component: ({ props }) => {
     if (!hasAllProps(props as Record<string, unknown>, "labels", "series")) return null;
-    const data = buildChartData(props.labels, props.series);
+    const data = buildChartData(props.labels, props.series) ?? [];
     if (!data.length) return null;
     return React.createElement(LineChartCondensedComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/PieChart.ts b/packages/react-ui/src/genui-lib/Charts/PieChart.ts
index 403d578c8..4f9220a74 100644
--- a/packages/react-ui/src/genui-lib/Charts/PieChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/PieChart.ts
@@ -30,7 +30,7 @@ export const PieChart = defineComponent({
       const data = labels.map((cat, i) => ({
         category: cat,
         value: typeof values[i] === "number" ? values[i] : 0,
-      }));
+      })) ?? [];
       return React.createElement(PieChartComponent, {
         data,
         categoryKey: "category",
diff --git a/packages/react-ui/src/genui-lib/Charts/RadarChart.ts b/packages/react-ui/src/genui-lib/Charts/RadarChart.ts
index f99ed73b7..3d59cd214 100644
--- a/packages/react-ui/src/genui-lib/Charts/RadarChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/RadarChart.ts
@@ -18,7 +18,7 @@ export const RadarChart = defineComponent({
   description: "Spider/web chart; use for comparing multiple variables across one or more entities",
   component: ({ props }) => {
     if (!hasAllProps(props as Record<string, unknown>, "labels", "series")) return null;
-    const data = buildChartData(props.labels, props.series);
+    const data = buildChartData(props.labels, props.series) ?? [];
     if (!data.length) return null;
     return React.createElement(RadarChartComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/RadialChart.ts b/packages/react-ui/src/genui-lib/Charts/RadialChart.ts
index bb94daa31..d4c7c6319 100644
--- a/packages/react-ui/src/genui-lib/Charts/RadialChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/RadialChart.ts
@@ -23,7 +23,7 @@ export const RadialChart = defineComponent({
       const data = labels.map((cat, i) => ({
         category: cat,
         value: typeof values[i] === "number" ? values[i] : 0,
-      }));
+      })) ?? [];
       if (!data.length) return null;
       return React.createElement(RadialChartComponent, {
         data,
diff --git a/packages/react-ui/src/genui-lib/Charts/ScatterChart.ts b/packages/react-ui/src/genui-lib/Charts/ScatterChart.ts
index ba00a2fe1..08061c924 100644
--- a/packages/react-ui/src/genui-lib/Charts/ScatterChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/ScatterChart.ts
@@ -36,7 +36,7 @@ export const ScatterChart = defineComponent({
           };
         }),
       };
-    });
+    }) ?? [];
     if (!data.length) return null;
     return React.createElement(ScatterChartComponent, {
       data,
diff --git a/packages/react-ui/src/genui-lib/Charts/SingleStackedBarChart.ts b/packages/react-ui/src/genui-lib/Charts/SingleStackedBarChart.ts
index f3584a13a..44cfb7873 100644
--- a/packages/react-ui/src/genui-lib/Charts/SingleStackedBarChart.ts
+++ b/packages/react-ui/src/genui-lib/Charts/SingleStackedBarChart.ts
@@ -24,7 +24,7 @@ export const SingleStackedBarChart = defineComponent({
       const data = labels.map((cat, i) => ({
         category: cat,
         value: typeof values[i] === "number" ? values[i] : 0,
-      }));
+      })) ?? [];
       if (!data.length) return null;
       return React.createElement(SingleStackedBarChartComponent, {
         data,