diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 57e6326cde..32deb04b8a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1278,11 +1278,13 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void selectIdentityForEmail(String email) {
-        if (!identity_selectable)
-            return;
         if (TextUtils.isEmpty(email))
             return;
 
+        if (!identity_selectable)
+            return;
+        identity_selectable = false;
+
         Bundle args = new Bundle();
         args.putString("email", email);
 
@@ -1322,7 +1324,6 @@ public class FragmentCompose extends FragmentBase {
                     EntityIdentity item = (EntityIdentity) adapter.getItem(pos);
                     if (item.id.equals(identity)) {
                         spIdentity.setSelection(pos);
-                        identity_selectable = false;
                         break;
                     }
                 }