diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 6cc2235a1b..948fa0028f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1220,7 +1220,7 @@ public class FragmentIdentity extends FragmentBase {
         outState.putInt("fair:auth", auth);
         outState.putString("fair:authprovider", provider);
         outState.putString("fair:html", signature);
-        outState.putString("fair:uri", (String) btnUri.getTag());
+        outState.putString("fair:uri", btnUri == null ? null : (String) btnUri.getTag());
         super.onSaveInstanceState(outState);
     }