diff --git a/web/src/components/graph/SystemGraph.tsx b/web/src/components/graph/SystemGraph.tsx
index 107508326..0ac536931 100644
--- a/web/src/components/graph/SystemGraph.tsx
+++ b/web/src/components/graph/SystemGraph.tsx
@@ -91,10 +91,11 @@ export default function SystemGraph({
       },
       yaxis: {
         show: false,
-        max: lastValue * 2,
+        min: 0,
+        max: threshold.warning + 10,
       },
     };
-  }, [graphId, lastValue, threshold, systemTheme, theme, formatTime]);
+  }, [graphId, threshold, systemTheme, theme, formatTime]);
 
   useEffect(() => {
     ApexCharts.exec(graphId, "updateOptions", options, true, true);
diff --git a/web/src/pages/System.tsx b/web/src/pages/System.tsx
index eb472a10f..9e7ece82d 100644
--- a/web/src/pages/System.tsx
+++ b/web/src/pages/System.tsx
@@ -575,7 +575,7 @@ function GeneralMetrics({ lastUpdated, setLastUpdated }: GeneralMetricsProps) {
                 graphId={`${series.name}-cpu`}
                 name={series.name.replaceAll("_", " ")}
                 unit="%"
-                threshold={InferenceThreshold}
+                threshold={DetectorCpuThreshold}
                 updateTimes={updateTimes}
                 data={[series]}
               />