diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift
index 19a8c3b61..878e2a6ee 100644
--- a/SessionMessagingKit/Database/Models/Interaction.swift
+++ b/SessionMessagingKit/Database/Models/Interaction.swift
@@ -410,6 +410,14 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
                 
             default: break
         }
+        
+        // Start the disappearing messages timer if needed
+        if self.expiresStartedAtMs != nil {
+            JobRunner.upsert(
+                db,
+                job: DisappearingMessagesJob.updateNextRunIfNeeded(db)
+            )
+        }
     }
     
     public mutating func didInsert(_ inserted: InsertionSuccess) {
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 386cb9258..46e339cfb 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -610,16 +610,6 @@ public final class MessageSender {
                 // Mark the message as sent
                 try interaction.recipientStates
                     .updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.sent))
-                
-                // Start the disappearing messages timer if needed
-                JobRunner.upsert(
-                    db,
-                    job: DisappearingMessagesJob.updateNextRunIfNeeded(
-                        db,
-                        interaction: interaction,
-                        startedAtMs: (Date().timeIntervalSince1970 * 1000)
-                    )
-                )
             }
         }