diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift
index fc2d6a1f7..23b25a358 100644
--- a/SessionMessagingKit/Database/Models/Interaction.swift
+++ b/SessionMessagingKit/Database/Models/Interaction.swift
@@ -379,7 +379,7 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
            disappearingMessagesConfiguration.isEnabled
         {
             self.expiresInSeconds = disappearingMessagesConfiguration.durationSeconds
-            if disappearingMessagesConfiguration.type == .disappearAfterSend {
+            if self.variant == .standardOutgoing || disappearingMessagesConfiguration.type == .disappearAfterSend {
                 self.expiresStartedAtMs = Double(self.timestampMs)
             }
         }