diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 68debe7e8..6b37e97a3 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -457,13 +457,16 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
             }
 
             _ = try updatedConfig.saved(db)
-
+            
+            let nowInMs: Double = floor(Date().timeIntervalSince1970 * 1000)
             let interaction: Interaction = try Interaction(
                 threadId: threadId,
                 authorId: getUserHexEncodedPublicKey(db),
                 variant: .infoDisappearingMessagesUpdate,
                 body: updatedConfig.messageInfoString(with: nil, isPreviousOff: !self.config.isEnabled),
-                timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000))
+                timestampMs: Int64(nowInMs),
+                expiresInSeconds: updatedConfig.isEnabled ? nil : self.config.durationSeconds,
+                expiresStartedAtMs: (!updatedConfig.isEnabled && self.config.type == .disappearAfterSend) ? nowInMs : nil
             )
             .inserted(db)
             
diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift
index 532b00556..749f14fe0 100644
--- a/SessionMessagingKit/Database/Models/Interaction.swift
+++ b/SessionMessagingKit/Database/Models/Interaction.swift
@@ -335,6 +335,7 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
         
         // Automatically add disapeparing messages configuration
         if self.variant.shouldFollowDisappearingMessagesConfiguration,
+           self.expiresInSeconds == nil, self.expiresStartedAtMs == nil,
            let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: self.threadId),
            disappearingMessagesConfiguration.isEnabled
         {