diff --git a/LoopFollow/Controllers/Nightscout/DeviceStatusLoop.swift b/LoopFollow/Controllers/Nightscout/DeviceStatusLoop.swift
index fe10b62b9..a8d538e0c 100644
--- a/LoopFollow/Controllers/Nightscout/DeviceStatusLoop.swift
+++ b/LoopFollow/Controllers/Nightscout/DeviceStatusLoop.swift
@@ -72,11 +72,9 @@ extension MainViewController {
                     while i <= toLoad {
                         if i < prediction.count {
                             let sgvValue = Int(round(prediction[i]))
-                            // Skip values higher than 600
-                            if sgvValue <= 600 {
-                                let prediction = ShareGlucoseData(sgv: sgvValue, date: predictionTime, direction: "flat")
-                                predictionData.append(prediction)
-                            }
+                            let clampedValue = min(max(sgvValue, 39), 400)
+                            let prediction = ShareGlucoseData(sgv: clampedValue, date: predictionTime, direction: "flat")
+                            predictionData.append(prediction)
                             predictionTime += 300
                         }
                         i += 1
diff --git a/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift b/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
index 57a940695..977f75987 100644
--- a/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
+++ b/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
@@ -182,7 +182,8 @@ extension MainViewController {
                                 minPredBG = min(minPredBG, predictionValue)
                                 maxPredBG = max(maxPredBG, predictionValue)
 
-                                let prediction = ShareGlucoseData(sgv: Int(round(predictionValue)), date: predictionTime, direction: "flat")
+                                let clampedValue = min(max(Int(round(predictionValue)), 39), 400)
+                                let prediction = ShareGlucoseData(sgv: clampedValue, date: predictionTime, direction: "flat")
                                 predictionData.append(prediction)
                                 predictionTime += 300
                             }