diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
index 8797bcd867..43c4dca721 100644
--- a/Loop/Managers/LoopDataManager.swift
+++ b/Loop/Managers/LoopDataManager.swift
@@ -1445,7 +1445,8 @@ extension LoopDataManager: BolusEntryViewModelDelegate {
     }
 
     var mostRecentPumpDataDate: Date? {
-        return doseStore.lastAddedPumpData
+        let date = doseStore.lastAddedPumpData
+        return date == .distantPast ? nil : date
     }
 
     func effectiveGlucoseTargetRangeSchedule(presumingMealEntry: Bool) -> GlucoseRangeSchedule? {