diff --git a/SessionMessagingKit/Messages/Message.swift b/SessionMessagingKit/Messages/Message.swift
index 79acfc9c3..e28c28d55 100644
--- a/SessionMessagingKit/Messages/Message.swift
+++ b/SessionMessagingKit/Messages/Message.swift
@@ -194,10 +194,7 @@ public extension Message {
             .reduce(nil) { prev, variant in
                 guard prev == nil else { return prev }
                 
-                let message: Message? = variant.messageType.fromProto(proto, sender: sender)
-                message?.attachDisappearingMessagesConfiguration(from: proto)
-                
-                return message
+                return variant.messageType.fromProto(proto, sender: sender)
             }
     }
     
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index 1bec5ccce..8580686dc 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -154,6 +154,7 @@ public enum MessageReceiver {
         message.sentTimestamp = envelope.timestamp
         message.receivedTimestamp = UInt64(SnodeAPI.currentOffsetTimestampMs())
         message.openGroupServerMessageId = openGroupMessageServerId.map { UInt64($0) }
+        message.attachDisappearingMessagesConfiguration(from: proto)
         
         // Validate
         var isValid: Bool = message.isValid