diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift
index 210fe4543..ca00c904c 100644
--- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
@@ -148,9 +148,7 @@ public final class MultiDeviceProtocol : NSObject {
     @objc(getAutoGeneratedMultiDeviceFRMessageForHexEncodedPublicKey:in:)
     public static func getAutoGeneratedMultiDeviceFRMessage(for hexEncodedPublicKey: String, in transaction: YapDatabaseReadWriteTransaction) -> FriendRequestMessage {
         let thread = TSContactThread.getOrCreateThread(withContactId: hexEncodedPublicKey, transaction: transaction)
-        let result = FriendRequestMessage(timestamp: NSDate.ows_millisecondTimeStamp(), thread: thread, body: "Please accept to enable messages to be synced across devices")
-        result.skipSave = true // TODO: Why is this necessary again?
-        return result
+        return FriendRequestMessage(timestamp: NSDate.ows_millisecondTimeStamp(), thread: thread, body: "Please accept to enable messages to be synced across devices")
     }
 
     /// See [Auto-Generated Friend Requests](https://github.com/loki-project/session-protocol-docs/wiki/Auto-Generated-Friend-Requests) for more information.
diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift
index 87f47c2a7..2934d2095 100644
--- a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift	
@@ -198,6 +198,7 @@ public final class SyncMessagesProtocol : NSObject {
             case .none, .requestExpired:
                 // We need to send the FR message to all of the user's devices as the contact sync message excludes slave devices
                 let autoGeneratedFRMessage = MultiDeviceProtocol.getAutoGeneratedMultiDeviceFRMessage(for: hexEncodedPublicKey, in: transaction)
+                autoGeneratedFRMessage.save(with: transaction)
                 // Use the message sender job queue for this to ensure that these messages get sent
                 // AFTER session requests (it's asssumed that the master device first syncs closed
                 // groups first and contacts after that).