diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 73a0f0b741..0090788486 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -374,6 +374,9 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                 Helper.unexpectedError(this, this, ex);
             }
         else {
+            if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
+                getSupportFragmentManager().popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
             fragmentTransaction.commit();
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f75f60ab31..8193677e90 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3196,6 +3196,9 @@ public class FragmentMessages extends FragmentBase {
             fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
             fragmentTransaction.commit();
         } else {
+            if (owner.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
+                manager.popBackStack("pro", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
             FragmentTransaction fragmentTransaction = manager.beginTransaction();
             fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
             fragmentTransaction.commit();