diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 7d7337dba6..9f50ca34fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -177,6 +177,9 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
 
                 Disposable disposable = delegate.pairAndPrime(address).subscribe(res -> //
                         handleSetupActionResult(podInitActionType, podInitReceiver, res, time, null));
+
+                removeNextPodAddress();
+
                 return new PumpEnactResult().success(true).enacted(true);
             } catch (Exception ex) {
                 String comment = handleAndTranslateException(ex);
@@ -582,6 +585,11 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         return nextPodAddress;
     }
 
+    private void removeNextPodAddress() {
+        nextPodAddress = null;
+        OmnipodUtil.removeNextPodAddress();
+    }
+
     private void handleSetupActionResult(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, SetupActionResult res, long time, Profile profile) {
         String comment = null;
         switch (res.getResultType()) {