diff --git a/Loop/View Controllers/CarbAbsorptionViewController.swift b/Loop/View Controllers/CarbAbsorptionViewController.swift
index 985f040270..8488e1d885 100644
--- a/Loop/View Controllers/CarbAbsorptionViewController.swift	
+++ b/Loop/View Controllers/CarbAbsorptionViewController.swift	
@@ -113,8 +113,9 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
         }
         charts.startDate = chartStartDate
 
-        let midnight = Calendar.current.startOfDay(for: Date())
-        let listStart = min(midnight, chartStartDate)
+
+        let visiblePeriod = Calendar.current.date(byAdding: .hour, value: -24, to: Date()) ?? Calendar.current.startOfDay(for: Date())
+        let listStart = min(visiblePeriod, chartStartDate)
 
         let reloadGroup = DispatchGroup()
         let shouldUpdateGlucose = currentContext.contains(.glucose)
@@ -147,7 +148,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
                 }
 
                 reloadGroup.enter()
-                manager.carbStore.getGlucoseEffects(start:  chartStartDate, effectVelocities: manager.settings.dynamicCarbAbsorptionEnabled ? insulinCounteractionEffects : nil) { (result) in
+                manager.carbStore.getGlucoseEffects(start:  visiblePeriod, effectVelocities: manager.settings.dynamicCarbAbsorptionEnabled ? insulinCounteractionEffects : nil) { (result) in
                     switch result {
                     case .success(let effects):
                         carbEffects = effects
@@ -169,7 +170,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
 
         if shouldUpdateCarbs {
             reloadGroup.enter()
-            self.deviceManager.loopManager.carbStore.getTotalCarbs(since: midnight) { (result) in
+            self.deviceManager.loopManager.carbStore.getTotalCarbs(since: visiblePeriod) { (result) in
                 switch result {
                 case .success(let total):
                     carbTotal = total
@@ -517,7 +518,7 @@ final class CarbAbsorptionViewController: ChartsTableViewController, Identifiabl
             }
         }
     }
-    
+
     @IBAction func unwindFromBolusViewController(_ segue: UIStoryboardSegue) {
         if let bolusViewController = segue.source as? BolusViewController {
             if let bolus = bolusViewController.bolus, bolus > 0 {