diff --git a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
index dc51eb564..bd436359a 100644
--- a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
+++ b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
@@ -240,7 +240,8 @@ public extension VisibleMessage {
         let specifiedTtl: UInt64? = {
             guard
                 let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: interaction.threadId),
-                disappearingMessagesConfiguration.isEnabled
+                disappearingMessagesConfiguration.isEnabled,
+                disappearingMessagesConfiguration.type == .disappearAfterSend
             else {
                 return nil
             }