diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index 6e49b6ba7..5cd6c371e 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -221,7 +221,7 @@ extension MessageReceiver {
                 isPreviousOff: !localConfig.isEnabled
             ),
             timestampMs: protoLastChangeTimestampMs,
-            expiresInSeconds: (remoteConfig.isEnabled ? nil : localConfig.durationSeconds),
+            expiresInSeconds: (remoteConfig.isEnabled ? remoteConfig.durationSeconds : localConfig.durationSeconds),
             expiresStartedAtMs: (!remoteConfig.isEnabled && localConfig.type == .disappearAfterSend ?
                 Double(protoLastChangeTimestampMs) :
                 nil