diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index 81da7e2e3..c5dd8ca1b 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -182,6 +182,19 @@ public enum MessageReceiver {
         openGroupId: String?,
         dependencies: SMKDependencies = SMKDependencies()
     ) throws {
+        
+        // Update any disappearing messages configuration if needed.
+        // We need to update this before processing the messages, because
+        // the message with the disappearing message config update should
+        // follow the new config.
+        try MessageReceiver.updateDisappearingMessagesConfigurationIfNeeded(
+            db,
+            threadId: message.threadId,
+            sender: message.sender,
+            sentTimestamp: message.sentTimestamp,
+            proto: proto
+        )
+        
         switch message {
             case let message as ReadReceipt:
                 try MessageReceiver.handleReadReceipt(db, message: message)
@@ -221,15 +234,6 @@ public enum MessageReceiver {
             default: fatalError()
         }
         
-        // Update any disappearing messages configuration if needed
-        try MessageReceiver.updateDisappearingMessagesConfigurationIfNeeded(
-            db,
-            threadId: message.threadId,
-            sender: message.sender,
-            sentTimestamp: message.sentTimestamp,
-            proto: proto
-        )
-        
         // Perform any required post-handling logic
         try MessageReceiver.postHandleMessage(db, message: message, openGroupId: openGroupId)
     }