diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index c2a1199101..a302eb07c7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -555,10 +555,9 @@ public class FragmentBase extends Fragment {
             @OnLifecycleEvent(Lifecycle.Event.ON_ANY)
             public void onAny() {
                 Lifecycle.State state = getViewLifecycleOwner().getLifecycle().getCurrentState();
+                backPressedCallback.remove();
                 if (state.isAtLeast(Lifecycle.State.STARTED))
                     activity.getOnBackPressedDispatcher().addCallback(backPressedCallback);
-                else
-                    backPressedCallback.remove();
             }
         });
     }