diff --git a/js/background.js b/js/background.js
index af9aa33f8..0a356c577 100644
--- a/js/background.js
+++ b/js/background.js
@@ -723,7 +723,7 @@
     });
 
     Whisper.events.on('onEditProfile', async () => {
-      const ourNumber = textsecure.storage.user.getNumber();
+      const ourNumber = window.storage.get('primaryDevicePubKey');
       const conversation = await ConversationController.getOrCreateAndWait(
         ourNumber,
         'private'
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 20c749925..da2d7ff17 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1119,7 +1119,7 @@ MessageReceiver.prototype.extend({
         Whisper.events.trigger('secondaryDeviceRegistration');
         // Update profile name
         if (dataMessage && dataMessage.profile) {
-          const ourNumber = textsecure.storage.user.getNumber();
+          const ourNumber = window.storage.get('primaryDevicePubKey');
           const me = window.ConversationController.get(ourNumber);
           if (me) {
             me.setLokiProfile(dataMessage.profile);