diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift
index 133835a54..9ac590f51 100644
--- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift	
@@ -60,9 +60,8 @@ public final class MultiDeviceProtocol : NSObject {
         let message = messageSend.message
         let messageSender = SSKEnvironment.shared.messageSender
         promise.done(on: OWSDispatch.sendingQueue()) { thread in
-            let isSessionResetMessage = (message is EphemeralMessage) && thread.sessionResetStatus == .requestReceived
             let shouldSendAutoGeneratedFR = !thread.isContactFriend && !(message is FriendRequestMessage)
-                && !(message is SessionRequestMessage) && !isSessionResetMessage && !(message is TypingIndicatorMessage)
+                && message.shouldBeSaved() // shouldBeSaved indicates it isn't a transient message
             if !shouldSendAutoGeneratedFR {
                 let messageSendCopy = copy(messageSend, for: destination, with: seal)
                 messageSender.sendMessage(messageSendCopy)