diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 8ac26e1e93..681755e57d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -225,11 +225,11 @@ public class FragmentBase extends Fragment {
         Log.i("Create " + this + " saved=" + (savedInstanceState != null));
         super.onCreate(savedInstanceState);
 
-        Bundle args = getArguments();
-        if (args == null)
-            setArguments(new Bundle());
-
-        if (savedInstanceState != null) {
+        if (savedInstanceState == null) {
+            Bundle args = getArguments();
+            if (args == null)
+                setArguments(new Bundle());
+        } else {
             subtitle = savedInstanceState.getString("fair:subtitle");
             requestKey = savedInstanceState.getString("fair:requestKey");
         }