diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
index 00eb18c5d6..1af0990d2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
@@ -173,7 +173,9 @@ public class SealedSenderAccessUtil {
   }
 
   private static @NonNull CertificateType getUnidentifiedAccessCertificateType() {
-    if (SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled()) {
+    if (SignalStore.account().isPhoneNumberless()) {
+      return CertificateType.ACI_ONLY;
+    } else if (SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled()) {
       return CertificateType.ACI_AND_E164;
     } else {
       return CertificateType.ACI_ONLY;