diff --git a/frontend/src/lib/components/apps/components/display/AppChartJsV2.svelte b/frontend/src/lib/components/apps/components/display/AppChartJsV2.svelte
index 7442496572..4f2a361cde 100644
--- a/frontend/src/lib/components/apps/components/display/AppChartJsV2.svelte
+++ b/frontend/src/lib/components/apps/components/display/AppChartJsV2.svelte
@@ -88,12 +88,10 @@
 		datasets && xData && resolvedDatasets
 			? {
 					labels: resolvedXData,
-					datasets: resolvedDatasets.map((d, index) => {
-						return {
-							label: d.name,
-							data: resolvedDatasetsValues[index]
-						}
-					})
+					datasets: resolvedDatasets?.map((d, index) => ({
+						label: d.name,
+						data: Array.isArray(resolvedDatasetsValues[index]) ? resolvedDatasetsValues[index] : []
+					}))
 			  }
 			: result