diff --git a/src/app/(admin)/admin/reports/page.tsx b/src/app/(admin)/admin/reports/page.tsx
index 7d18f12..4c6f25a 100644
--- a/src/app/(admin)/admin/reports/page.tsx
+++ b/src/app/(admin)/admin/reports/page.tsx
@@ -532,9 +532,9 @@ function StageAnalytics() {
               <Skeleton className="h-[350px]" />
             ) : scoreDistribution ? (
               <ScoreDistributionChart
-                data={scoreDistribution.distribution}
-                averageScore={scoreDistribution.averageScore}
-                totalScores={scoreDistribution.totalScores}
+                data={scoreDistribution.distribution ?? []}
+                averageScore={scoreDistribution.averageScore ?? 0}
+                totalScores={scoreDistribution.totalScores ?? 0}
               />
             ) : null}
 
diff --git a/src/app/(observer)/observer/reports/page.tsx b/src/app/(observer)/observer/reports/page.tsx
index 554b2b6..748e0b2 100644
--- a/src/app/(observer)/observer/reports/page.tsx
+++ b/src/app/(observer)/observer/reports/page.tsx
@@ -399,9 +399,9 @@ function AnalyticsTab({ selectedValue }: { selectedValue: string }) {
           <Skeleton className="h-[350px]" />
         ) : scoreDistribution ? (
           <ScoreDistributionChart
-            data={scoreDistribution.distribution}
-            averageScore={scoreDistribution.averageScore}
-            totalScores={scoreDistribution.totalScores}
+            data={scoreDistribution.distribution ?? []}
+            averageScore={scoreDistribution.averageScore ?? 0}
+            totalScores={scoreDistribution.totalScores ?? 0}
           />
         ) : null}
 
diff --git a/src/components/charts/diversity-metrics.tsx b/src/components/charts/diversity-metrics.tsx
index e8d6316..44922e5 100644
--- a/src/components/charts/diversity-metrics.tsx
+++ b/src/components/charts/diversity-metrics.tsx
@@ -115,7 +115,7 @@ export function DiversityMetricsChart({ data }: DiversityMetricsProps) {
           </CardHeader>
           <CardContent>
             <div style={{ height: '400px' }}>
-              <ResponsivePie
+              {nivoPieData.length > 0 ? <ResponsivePie
                 data={nivoPieData}
                 theme={nivoTheme}
                 colors={[...BRAND_COLORS]}
@@ -149,7 +149,9 @@ export function DiversityMetricsChart({ data }: DiversityMetricsProps) {
                     symbolShape: 'circle',
                   },
                 ]}
-              />
+              /> : (
+                <p className="text-muted-foreground text-center py-8">No geographic data</p>
+              )}
             </div>
           </CardContent>
         </Card>
diff --git a/src/components/charts/evaluation-timeline.tsx b/src/components/charts/evaluation-timeline.tsx
index e6b7eac..a296b2c 100644
--- a/src/components/charts/evaluation-timeline.tsx
+++ b/src/components/charts/evaluation-timeline.tsx
@@ -63,9 +63,10 @@ export function EvaluationTimelineChart({ data }: EvaluationTimelineProps) {
             pointBorderWidth={2}
             pointBorderColor="#ffffff"
             useMesh={true}
-            enableSlices="x"
+            enableSlices={formattedData.length >= 2 ? 'x' : false}
             sliceTooltip={({ slice }) => {
               const point = slice.points[0]
+              if (!point) return null
               const dataItem = formattedData.find(
                 (d) => d.dateFormatted === point.data.xFormatted
               )