diff --git a/src/plugins/built-in/gradeAnalytics/AnalyticsAreaChart.svelte b/src/plugins/built-in/gradeAnalytics/AnalyticsAreaChart.svelte
index 3c1ba0b9..441205d2 100644
--- a/src/plugins/built-in/gradeAnalytics/AnalyticsAreaChart.svelte
+++ b/src/plugins/built-in/gradeAnalytics/AnalyticsAreaChart.svelte
@@ -9,6 +9,7 @@
     buildGradeTrendChart,
     getTimeRangeLabel,
     type TimeRange,
+    type TrendPoint,
   } from "./timeRange";
   import { computeGradeForecast, aggregateToMonthlyPoints } from "./utils/gradePrediction";
   import PredictionMonthsSlider from "./PredictionMonthsSlider.svelte";
@@ -159,6 +160,32 @@
     );
     return monthly.length >= 3;
   });
+
+  /** Historical + future forecast points so tooltips work across the dashed line. */
+  const chartData = $derived.by((): TrendPoint[] => {
+    if (!showPrediction || !forecast?.points.length) {
+      return historicalData;
+    }
+
+    const points = historicalData.map((p) => ({ ...p }));
+    const validHist = points.filter((p) => !Number.isNaN(p.average));
+    const last = validHist[validHist.length - 1];
+
+    if (last) {
+      const lastIdx = points.findIndex((p) => p.date.getTime() === last.date.getTime());
+      if (lastIdx >= 0) {
+        points[lastIdx] = { ...points[lastIdx], forecast: last.average };
+      }
+    }
+
+    const futurePoints: TrendPoint[] = forecast.points.map((p) => ({
+      date: p.date,
+      count: 0,
+      forecast: p.value,
+    })) as TrendPoint[];
+
+    return [...points, ...futurePoints];
+  });
 </script>
 
 <article class="bsplus-analytics-card">
@@ -201,7 +228,7 @@
       <Chart.Container config={chartConfig} class="bsplus-chart-surface w-full">
         <AreaChart
           legend
-          data={historicalData}
+          data={chartData}
           x="date"
           {xDomain}
           yScale={yScale}
diff --git a/src/plugins/built-in/gradeAnalytics/chart/chart-tooltip.svelte b/src/plugins/built-in/gradeAnalytics/chart/chart-tooltip.svelte
index 1761dd59..80b5248f 100644
--- a/src/plugins/built-in/gradeAnalytics/chart/chart-tooltip.svelte
+++ b/src/plugins/built-in/gradeAnalytics/chart/chart-tooltip.svelte
@@ -143,7 +143,7 @@
                   {itemConfig?.label || item.name}
                 </span>
               </div>
-              {#if item.value !== undefined}
+              {#if item.value != null && !Number.isNaN(Number(item.value))}
                 <span class="font-mono font-medium tabular-nums">
                   {item.value.toLocaleString()}
                 </span>