diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index e7934599b6..11f9165301 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -37,6 +37,7 @@ import android.os.Looper;
 import android.util.Printer;
 import android.webkit.CookieManager;
 
+import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
 import java.util.Date;
@@ -122,6 +123,8 @@ public class ApplicationEx extends Application {
         WorkerWatchdog.init(this);
         WorkerCleanup.queue(this);
 
+        FragmentManager.enableNewStateManager(false);
+
         registerReceiver(onScreenOff, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 
         if (BuildConfig.DEBUG)