diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index 5ae758ddd1..28a8ab3bc1 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -329,12 +329,16 @@ final class DeviceDataManager {
      Ensures pump data is current by either waking and polling, or ensuring we're listening to sentry packets.
      */
     fileprivate func assertCurrentPumpData() {
-        guard let device = rileyLinkManager.firstConnectedDevice, pumpDataIsStale() else {
+        guard let device = rileyLinkManager.firstConnectedDevice else {
             return
         }
 
         device.assertIdleListening()
 
+        guard pumpDataIsStale() else {
+            return
+        }
+
         readPumpData { (result) in
             let nsPumpStatus: NightscoutUploadKit.PumpStatus?
             switch result {