diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
index 14e338539..d8467e2be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
@@ -108,7 +108,7 @@ public class IdentityDatabase extends Database {
                                        firstUse,
                                        timestamp,
                                        nonblockingApproval);
-      } else if (addressName.charAt(0) != '+') {
+      } else if (!fastIsE164(addressName)) {
         if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(addressName)) {
           Recipient recipient = Recipient.external(context, addressName);
 
@@ -269,4 +269,8 @@ public class IdentityDatabase extends Database {
 
     EventBus.getDefault().post(new IdentityRecord(recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval));
   }
+
+  private boolean fastIsE164(@NonNull String value) {
+    return value.charAt(0) == '+' || value.length() <= 15;
+  }
 }