diff --git a/js/models/conversations.js b/js/models/conversations.js
index 56ceea27f..39b8f2979 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -202,6 +202,12 @@
     isMe() {
       return this.id === window.storage.get('primaryDevicePubKey');
     },
+    async isOurDevice() {
+      const ourDevices = await window.libloki.storage.getPairedDevicesFor(
+        this.ourNumber
+      );
+      return this.id === this.ourNumber || ourDevices.includes(this.id);
+    },
     isPublic() {
       return !!(this.id && this.id.match(/^publicChat:/));
     },
diff --git a/libloki/storage.js b/libloki/storage.js
index dd3889fba..3a2d084e2 100644
--- a/libloki/storage.js
+++ b/libloki/storage.js
@@ -240,6 +240,10 @@
     return secondaryPubKeys.concat(primaryDevicePubKey);
   }
 
+  function getPairedDevicesFor(pubkey) {
+    return window.Signal.Data.getPairedDevicesFor(pubkey);
+  }
+
   window.libloki.storage = {
     getPreKeyBundleForContact,
     saveContactPreKeyBundle,
@@ -250,6 +254,7 @@
     removePairingAuthorisationForSecondaryPubKey,
     getGrantAuthorisationForSecondaryPubKey,
     getAuthorisationForSecondaryPubKey,
+    getPairedDevicesFor,
     getAllDevicePubKeysForPrimaryPubKey,
     getSecondaryDevicesFor,
     getPrimaryDeviceMapping,
diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
index 5be3b7368..00e4be293 100644
--- a/libtextsecure/outgoing_message.js
+++ b/libtextsecure/outgoing_message.js
@@ -350,23 +350,33 @@ OutgoingMessage.prototype = {
           } catch (e) {
             // do nothing
           }
-          if (
-            conversation &&
-            !conversation.isFriend() &&
-            !conversation.hasReceivedFriendRequest() &&
-            !this.isGroup
-          ) {
-            // We want to send an automated friend request if:
-            // - We aren't already friends
-            // - We haven't received a friend request from this device
-            // - We haven't sent a friend request recently
-            if (conversation.friendRequestTimerIsExpired()) {
-              isMultiDeviceRequest = true;
-              thisDeviceMessageType = 'friend-request';
-            } else {
-              // Throttle automated friend requests
-              this.successfulNumbers.push(devicePubKey);
-              return null;
+          if (conversation && !this.isGroup) {
+            const isOurDevice = await conversation.isOurDevice();
+            const isFriends =
+              conversation.isFriend() ||
+              conversation.hasReceivedFriendRequest();
+            // We should only send a friend request to our device if we don't have keys
+            const shouldSendAutomatedFR = isOurDevice ? !keysFound : !isFriends;
+            if (shouldSendAutomatedFR) {
+              // We want to send an automated friend request if:
+              // - We aren't already friends
+              // - We haven't received a friend request from this device
+              // - We haven't sent a friend request recently
+              if (conversation.friendRequestTimerIsExpired()) {
+                isMultiDeviceRequest = true;
+                thisDeviceMessageType = 'friend-request';
+              } else {
+                // Throttle automated friend requests
+                this.successfulNumbers.push(devicePubKey);
+                return null;
+              }
+            }
+
+            // If we're not friends with our own device then we should become friends
+            if (isOurDevice && keysFound && !isFriends) {
+              conversation.setFriendRequestStatus(
+                window.friends.friendRequestStatusEnum.friends
+              );
             }
           }
         }