diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
index e2c80374a2..4112a0cdfe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
@@ -200,6 +200,10 @@ public class OmnipodManager {
 
         SingleSubject<BolusDeliveryResult> bolusCompletionSubject = SingleSubject.create();
 
+        synchronized (bolusDataLock) {
+            activeBolusData = new ActiveBolusData(units, startDate, bolusCompletionSubject, disposables);
+        }
+
         disposables.add(Completable.complete() //
                 .delay(estimatedRemainingBolusDuration.getMillis() + 250, TimeUnit.MILLISECONDS) //
                 .observeOn(AndroidSchedulers.mainThread()) //
@@ -229,10 +233,6 @@ public class OmnipodManager {
                 })
                 .subscribe());
 
-        synchronized (bolusDataLock) {
-            activeBolusData = new ActiveBolusData(units, startDate, bolusCompletionSubject, disposables);
-        }
-
         return new BolusCommandResult(commandDeliveryStatus, bolusCompletionSubject);
     }