diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 7dd231b3bd..fa1632a4aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -207,7 +207,7 @@ public class FragmentCompose extends FragmentEx {
                 tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at));
                 tvExtraSuffix.setText(at < 0 ? null : identity.email.substring(at));
                 if (pro) {
-                    tvSignature.setText(identity == null ? null : Html.fromHtml(identity.signature));
+                    tvSignature.setText(identity == null || identity.signature == null ? null : Html.fromHtml(identity.signature));
                     grpSignature.setVisibility(identity == null || TextUtils.isEmpty(identity.signature) ? View.GONE : View.VISIBLE);
                 }
             }