diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
index e3852d20cf..187b9749d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
@@ -9,6 +9,7 @@ import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord.PinnedConversation;
 import org.whispersystems.signalservice.api.util.OptionalUtil;
@@ -116,7 +117,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
     boolean                              preferContactAvatars          = remote.isPreferContactAvatars();
     int                                  universalExpireTimer          = remote.getUniversalExpireTimer();
     boolean                              primarySendsSms               = SignalStore.account().isPrimaryDevice() ? local.isPrimarySendsSms() : remote.isPrimarySendsSms();
-    String                               e164                          = SignalStore.account().isPrimaryDevice() ? local.getE164() : remote.getE164();
+    String                               e164                          = SignalStore.account().isPrimaryDevice() && (!FeatureFlags.phoneNumberPrivacy() || !self.getPnpCapability().isSupported()) ? local.getE164() : remote.getE164();
     List<String>                         defaultReactions              = remote.getDefaultReactions().size() > 0 ? remote.getDefaultReactions() : local.getDefaultReactions();
     boolean                              displayBadgesOnProfile        = remote.isDisplayBadgesOnProfile();
     boolean                              subscriptionManuallyCancelled = remote.isSubscriptionManuallyCancelled();
@@ -135,38 +136,42 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
     } else if (matchesLocal) {
       return local;
     } else {
-      return new SignalAccountRecord.Builder(keyGenerator.generate(), unknownFields)
-                                    .setGivenName(givenName)
-                                    .setFamilyName(familyName)
-                                    .setAvatarUrlPath(avatarUrlPath)
-                                    .setProfileKey(profileKey)
-                                    .setNoteToSelfArchived(noteToSelfArchived)
-                                    .setNoteToSelfForcedUnread(noteToSelfForcedUnread)
-                                    .setReadReceiptsEnabled(readReceipts)
-                                    .setTypingIndicatorsEnabled(typingIndicators)
-                                    .setSealedSenderIndicatorsEnabled(sealedSenderIndicators)
-                                    .setLinkPreviewsEnabled(linkPreviews)
-                                    .setUnlistedPhoneNumber(unlisted)
-                                    .setPhoneNumberSharingMode(phoneNumberSharingMode)
-                                    .setUnlistedPhoneNumber(unlisted)
-                                    .setPinnedConversations(pinnedConversations)
-                                    .setPreferContactAvatars(preferContactAvatars)
-                                    .setPayments(payments.isEnabled(), payments.getEntropy().orElse(null))
-                                    .setUniversalExpireTimer(universalExpireTimer)
-                                    .setPrimarySendsSms(primarySendsSms)
-                                    .setE164(e164)
-                                    .setDefaultReactions(defaultReactions)
-                                    .setSubscriber(subscriber)
-                                    .setDisplayBadgesOnProfile(displayBadgesOnProfile)
-                                    .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
-                                    .setKeepMutedChatsArchived(keepMutedChatsArchived)
-                                    .setHasSetMyStoriesPrivacy(hasSetMyStoriesPrivacy)
-                                    .setHasViewedOnboardingStory(hasViewedOnboardingStory)
-                                    .setStoriesDisabled(storiesDisabled)
-                                    .setHasReadOnboardingStory(hasReadOnboardingStory)
-                                    .setHasSeenGroupStoryEducationSheet(hasSeenGroupStoryEducation)
-                                    .setUsername(username)
-                                    .build();
+      SignalAccountRecord.Builder builder = new SignalAccountRecord.Builder(keyGenerator.generate(), unknownFields)
+                                                                   .setGivenName(givenName)
+                                                                   .setFamilyName(familyName)
+                                                                   .setAvatarUrlPath(avatarUrlPath)
+                                                                   .setProfileKey(profileKey)
+                                                                   .setNoteToSelfArchived(noteToSelfArchived)
+                                                                   .setNoteToSelfForcedUnread(noteToSelfForcedUnread)
+                                                                   .setReadReceiptsEnabled(readReceipts)
+                                                                   .setTypingIndicatorsEnabled(typingIndicators)
+                                                                   .setSealedSenderIndicatorsEnabled(sealedSenderIndicators)
+                                                                   .setLinkPreviewsEnabled(linkPreviews)
+                                                                   .setUnlistedPhoneNumber(unlisted)
+                                                                   .setPhoneNumberSharingMode(phoneNumberSharingMode)
+                                                                   .setUnlistedPhoneNumber(unlisted)
+                                                                   .setPinnedConversations(pinnedConversations)
+                                                                   .setPreferContactAvatars(preferContactAvatars)
+                                                                   .setPayments(payments.isEnabled(), payments.getEntropy().orElse(null))
+                                                                   .setUniversalExpireTimer(universalExpireTimer)
+                                                                   .setPrimarySendsSms(primarySendsSms)
+                                                                   .setDefaultReactions(defaultReactions)
+                                                                   .setSubscriber(subscriber)
+                                                                   .setDisplayBadgesOnProfile(displayBadgesOnProfile)
+                                                                   .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
+                                                                   .setKeepMutedChatsArchived(keepMutedChatsArchived)
+                                                                   .setHasSetMyStoriesPrivacy(hasSetMyStoriesPrivacy)
+                                                                   .setHasViewedOnboardingStory(hasViewedOnboardingStory)
+                                                                   .setStoriesDisabled(storiesDisabled)
+                                                                   .setHasReadOnboardingStory(hasReadOnboardingStory)
+                                                                   .setHasSeenGroupStoryEducationSheet(hasSeenGroupStoryEducation)
+                                                                   .setUsername(username);
+
+      if (!FeatureFlags.phoneNumberPrivacy() || !self.getPnpCapability().isSupported()) {
+        builder.setE164(e164);
+      }
+
+      return builder.build();
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index c888d7595d..ff9ce857a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.payments.Entropy;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.subscription.Subscriber;
 import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
@@ -123,40 +124,42 @@ public final class StorageSyncHelper {
 
     final boolean hasReadOnboardingStory = SignalStore.storyValues().getUserHasViewedOnboardingStory() || SignalStore.storyValues().getUserHasReadOnboardingStory();
 
-    SignalAccountRecord account = new SignalAccountRecord.Builder(self.getStorageServiceId(), record != null ? record.getSyncExtras().getStorageProto() : null)
-                                                         .setProfileKey(self.getProfileKey())
-                                                         .setGivenName(self.getProfileName().getGivenName())
-                                                         .setFamilyName(self.getProfileName().getFamilyName())
-                                                         .setAvatarUrlPath(self.getProfileAvatar())
-                                                         .setNoteToSelfArchived(record != null && record.getSyncExtras().isArchived())
-                                                         .setNoteToSelfForcedUnread(record != null && record.getSyncExtras().isForcedUnread())
-                                                         .setTypingIndicatorsEnabled(TextSecurePreferences.isTypingIndicatorsEnabled(context))
-                                                         .setReadReceiptsEnabled(TextSecurePreferences.isReadReceiptsEnabled(context))
-                                                         .setSealedSenderIndicatorsEnabled(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context))
-                                                         .setLinkPreviewsEnabled(SignalStore.settings().isLinkPreviewsEnabled())
-                                                         .setUnlistedPhoneNumber(SignalStore.phoneNumberPrivacy().getPhoneNumberListingMode().isUnlisted())
-                                                         .setPhoneNumberSharingMode(StorageSyncModels.localToRemotePhoneNumberSharingMode(SignalStore.phoneNumberPrivacy().getPhoneNumberSharingMode()))
-                                                         .setPinnedConversations(StorageSyncModels.localToRemotePinnedConversations(pinned))
-                                                         .setPreferContactAvatars(SignalStore.settings().isPreferSystemContactPhotos())
-                                                         .setPayments(SignalStore.paymentsValues().mobileCoinPaymentsEnabled(), Optional.ofNullable(SignalStore.paymentsValues().getPaymentsEntropy()).map(Entropy::getBytes).orElse(null))
-                                                         .setPrimarySendsSms(Util.isDefaultSmsProvider(context))
-                                                         .setUniversalExpireTimer(SignalStore.settings().getUniversalExpireTimer())
-                                                         .setE164(self.requireE164())
-                                                         .setDefaultReactions(SignalStore.emojiValues().getReactions())
-                                                         .setSubscriber(StorageSyncModels.localToRemoteSubscriber(SignalStore.donationsValues().getSubscriber()))
-                                                         .setDisplayBadgesOnProfile(SignalStore.donationsValues().getDisplayBadgesOnProfile())
-                                                         .setSubscriptionManuallyCancelled(SignalStore.donationsValues().isUserManuallyCancelled())
-                                                         .setKeepMutedChatsArchived(SignalStore.settings().shouldKeepMutedChatsArchived())
-                                                         .setHasSetMyStoriesPrivacy(SignalStore.storyValues().getUserHasBeenNotifiedAboutStories())
-                                                         .setHasViewedOnboardingStory(SignalStore.storyValues().getUserHasViewedOnboardingStory())
-                                                         .setStoriesDisabled(SignalStore.storyValues().isFeatureDisabled())
-                                                         .setStoryViewReceiptsState(storyViewReceiptsState)
-                                                         .setHasReadOnboardingStory(hasReadOnboardingStory)
-                                                         .setHasSeenGroupStoryEducationSheet(SignalStore.storyValues().getUserHasSeenGroupStoryEducationSheet())
-                                                         .setUsername(self.getUsername().orElse(null))
-                                                         .build();
+    SignalAccountRecord.Builder account = new SignalAccountRecord.Builder(self.getStorageServiceId(), record != null ? record.getSyncExtras().getStorageProto() : null)
+                                                                 .setProfileKey(self.getProfileKey())
+                                                                 .setGivenName(self.getProfileName().getGivenName())
+                                                                 .setFamilyName(self.getProfileName().getFamilyName())
+                                                                 .setAvatarUrlPath(self.getProfileAvatar())
+                                                                 .setNoteToSelfArchived(record != null && record.getSyncExtras().isArchived())
+                                                                 .setNoteToSelfForcedUnread(record != null && record.getSyncExtras().isForcedUnread())
+                                                                 .setTypingIndicatorsEnabled(TextSecurePreferences.isTypingIndicatorsEnabled(context))
+                                                                 .setReadReceiptsEnabled(TextSecurePreferences.isReadReceiptsEnabled(context))
+                                                                 .setSealedSenderIndicatorsEnabled(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context))
+                                                                 .setLinkPreviewsEnabled(SignalStore.settings().isLinkPreviewsEnabled())
+                                                                 .setUnlistedPhoneNumber(SignalStore.phoneNumberPrivacy().getPhoneNumberListingMode().isUnlisted())
+                                                                 .setPhoneNumberSharingMode(StorageSyncModels.localToRemotePhoneNumberSharingMode(SignalStore.phoneNumberPrivacy().getPhoneNumberSharingMode()))
+                                                                 .setPinnedConversations(StorageSyncModels.localToRemotePinnedConversations(pinned))
+                                                                 .setPreferContactAvatars(SignalStore.settings().isPreferSystemContactPhotos())
+                                                                 .setPayments(SignalStore.paymentsValues().mobileCoinPaymentsEnabled(), Optional.ofNullable(SignalStore.paymentsValues().getPaymentsEntropy()).map(Entropy::getBytes).orElse(null))
+                                                                 .setPrimarySendsSms(Util.isDefaultSmsProvider(context))
+                                                                 .setUniversalExpireTimer(SignalStore.settings().getUniversalExpireTimer())
+                                                                 .setDefaultReactions(SignalStore.emojiValues().getReactions())
+                                                                 .setSubscriber(StorageSyncModels.localToRemoteSubscriber(SignalStore.donationsValues().getSubscriber()))
+                                                                 .setDisplayBadgesOnProfile(SignalStore.donationsValues().getDisplayBadgesOnProfile())
+                                                                 .setSubscriptionManuallyCancelled(SignalStore.donationsValues().isUserManuallyCancelled())
+                                                                 .setKeepMutedChatsArchived(SignalStore.settings().shouldKeepMutedChatsArchived())
+                                                                 .setHasSetMyStoriesPrivacy(SignalStore.storyValues().getUserHasBeenNotifiedAboutStories())
+                                                                 .setHasViewedOnboardingStory(SignalStore.storyValues().getUserHasViewedOnboardingStory())
+                                                                 .setStoriesDisabled(SignalStore.storyValues().isFeatureDisabled())
+                                                                 .setStoryViewReceiptsState(storyViewReceiptsState)
+                                                                 .setHasReadOnboardingStory(hasReadOnboardingStory)
+                                                                 .setHasSeenGroupStoryEducationSheet(SignalStore.storyValues().getUserHasSeenGroupStoryEducationSheet())
+                                                                 .setUsername(self.getUsername().orElse(null));
 
-    return SignalStorageRecord.forAccount(account);
+    if (!FeatureFlags.phoneNumberPrivacy() || !self.getPnpCapability().isSupported()) {
+      account.setE164(self.requireE164());
+    }
+
+    return SignalStorageRecord.forAccount(account.build());
   }
 
   public static void applyAccountStorageSyncUpdates(@NonNull Context context, @NonNull Recipient self, @NonNull SignalAccountRecord updatedRecord, boolean fetchProfile) {