diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
index dd3c079ced..025d62a330 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
@@ -336,11 +336,9 @@ public class AapsOmnipodManager {
             return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
-        sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
 
         if (historyEntryType == PodHistoryEntryType.RESUME_DELIVERY) {
             cancelSuspendedFakeTbrIfExists();
-            sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
         }
 
         addSuccessToHistory(historyEntryType, profile.getBasalValues());
@@ -349,6 +347,9 @@ public class AapsOmnipodManager {
             showNotification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, null);
         }
 
+        sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+        sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
+
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
@@ -612,9 +613,11 @@ public class AapsOmnipodManager {
             return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         }
 
-        sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-
         addSuccessToHistory(PodHistoryEntryType.SET_TIME, null);
+
+        sendEvent(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+        sendEvent(new EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED));
+
         return new PumpEnactResult(injector).success(true).enacted(true);
     }