diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
index 8d20d0962a..d809181638 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
@@ -157,6 +157,8 @@ public class FragmentDialogBase extends DialogFragment {
             Log.i("Dialog key=" + targetRequestKey + " result=" + resultCode);
             if (targetRequestKey != null) {
                 Bundle args = getArguments();
+                if (args == null) // onDismiss
+                    args = new Bundle();
                 args.putInt("requestCode", targetRequestCode);
                 args.putInt("resultCode", resultCode);
                 getParentFragmentManager().setFragmentResult(targetRequestKey, args);