diff --git a/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift b/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift
index f7d4a7f36..8289168de 100644
--- a/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift
+++ b/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift
@@ -38,7 +38,13 @@ extension MainViewController {
             else { continue }
 
             let start = max(startDate.timeIntervalSince1970, graphHorizon)
-            var end   = start + (e["duration"] as? Double ?? 5) * 60   // seconds
+
+            var end: TimeInterval
+            if (e["durationType"] as? String) == "indefinite" { // Only for Loop overrides
+                end = maxEndDate
+            } else {
+                end = start + (e["duration"] as? Double ?? 5) * 60
+            }
 
             if i + 1 < sorted.count,
                let nextDateStr = (sorted[i + 1]["timestamp"] as? String) ?? (sorted[i + 1]["created_at"] as? String),