diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index a7ed1bef8c..9108d70924 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -219,7 +219,7 @@ public class FragmentBase extends Fragment {
 
         if (savedInstanceState == null) {
             Bundle args = getArguments();
-            if (args == null)
+            if (args == null && !isStateSaved())
                 setArguments(new Bundle());
         } else {
             title = savedInstanceState.getCharSequence("fair:title");