diff --git a/ts/ConversationController.ts b/ts/ConversationController.ts
index 0d40772c3458..4c932fe355f0 100644
--- a/ts/ConversationController.ts
+++ b/ts/ConversationController.ts
@@ -1329,6 +1329,26 @@ export class ConversationController {
     }
   }
 
+  async clearShareMyPhoneNumber(): Promise<void> {
+    const sharedWith = this.getAll().filter(c => c.get('shareMyPhoneNumber'));
+
+    if (sharedWith.length === 0) {
+      return;
+    }
+
+    log.info(
+      'ConversationController.clearShareMyPhoneNumber: ' +
+        `updating ${sharedWith.length} conversations`
+    );
+
+    await window.Signal.Data.updateConversations(
+      sharedWith.map(c => {
+        c.unset('shareMyPhoneNumber');
+        return c.attributes;
+      })
+    );
+  }
+
   // For testing
   async _forgetE164(e164: string): Promise<void> {
     const { server } = window.textsecure;
diff --git a/ts/textsecure/AccountManager.ts b/ts/textsecure/AccountManager.ts
index 8f3db2a4f7a5..3ba20875c456 100644
--- a/ts/textsecure/AccountManager.ts
+++ b/ts/textsecure/AccountManager.ts
@@ -1369,6 +1369,7 @@ export default class AccountManager extends EventTarget {
 
     if (oldPni) {
       await storage.protocol.removeOurOldPni(oldPni);
+      await window.ConversationController.clearShareMyPhoneNumber();
     }
 
     await storage.user.setPni(pni);