diff --git a/SessionMessagingKit/Messages/Message.swift b/SessionMessagingKit/Messages/Message.swift
index 72feb6cd3..9f0664316 100644
--- a/SessionMessagingKit/Messages/Message.swift
+++ b/SessionMessagingKit/Messages/Message.swift
@@ -67,7 +67,10 @@ public class Message: Codable {
         guard
             let threadId: String = threadId,
             let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: threadId)
-        else { return }
+        else {
+            proto.setExpirationTimer(0)
+            return
+        }
         
         proto.setExpirationTimer(UInt32(disappearingMessagesConfiguration.durationSeconds))
         proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs))