diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 15b54d0a28..191fa28e70 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -302,7 +302,10 @@ public class FragmentIdentity extends FragmentBase {
             public void afterTextChanged(Editable s) {
                 SpannableStringBuilder ssb = new SpannableStringBuilder(s);
                 Helper.clearComposingText(ssb);
-                etSignature.setTag(HtmlHelper.toHtml(ssb));
+                if (TextUtils.isEmpty(s.toString()))
+                    etSignature.setTag(null);
+                else
+                    etSignature.setTag(HtmlHelper.toHtml(ssb));
             }
         });