diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 657129aef..ed5f9e799 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -349,16 +349,16 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                 timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000))
             )
             .inserted(db)
-//
-//            try MessageSender.send(
-//                db,
-//                message: ExpirationTimerUpdate(
-//                    syncTarget: nil,
-//                    duration: UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
-//                ),
-//                interactionId: interaction.id,
-//                in: thread
-//            )
+
+            try MessageSender.send(
+                db,
+                message: ExpirationTimerUpdate(
+                    syncTarget: nil,
+                    duration: UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
+                ),
+                interactionId: interaction.id,
+                in: thread
+            )
         }
     }
 }
diff --git a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift
index 3d7aadda5..3bda8a61f 100644
--- a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
@@ -64,7 +64,7 @@ public final class ExpirationTimerUpdate: ControlMessage {
         
         return ExpirationTimerUpdate(
             syncTarget: dataMessageProto.syncTarget,
-            duration: dataMessageProto.expireTimer
+            duration: proto.hasExpirationTimer ? proto.expirationTimer : 0
         )
     }
 
@@ -85,6 +85,15 @@ public final class ExpirationTimerUpdate: ControlMessage {
             return nil
         }
         let contentProto = SNProtoContent.builder()
+        
+        // DisappearingMessagesConfiguration
+        do {
+            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+        } catch {
+            SNLog("Couldn't construct visible message proto from: \(self).")
+            return nil
+        }
+        
         do {
             contentProto.setDataMessage(try dataMessageProto.build())
             return try contentProto.build()
diff --git a/SessionMessagingKit/Messages/Message.swift b/SessionMessagingKit/Messages/Message.swift
index 0764dbbb4..72feb6cd3 100644
--- a/SessionMessagingKit/Messages/Message.swift
+++ b/SessionMessagingKit/Messages/Message.swift
@@ -70,12 +70,10 @@ public class Message: Codable {
         else { return }
         
         proto.setExpirationTimer(UInt32(disappearingMessagesConfiguration.durationSeconds))
+        proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs))
         
-        if disappearingMessagesConfiguration.isEnabled,
-            let type = disappearingMessagesConfiguration.type
-        {
+        if disappearingMessagesConfiguration.isEnabled, let type = disappearingMessagesConfiguration.type {
             proto.setExpirationType(type.toProto())
-            proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs))
         }
     }
 
diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index 381b68a73..af21abd59 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -7,47 +7,47 @@ import SessionUtilitiesKit
 extension MessageReceiver {
     internal static func handleExpirationTimerUpdate(_ db: Database, message: ExpirationTimerUpdate) throws {
         // Get the target thread
-        guard
-            let targetId: String = MessageReceiver.threadInfo(db, message: message, openGroupId: nil)?.id,
-            let sender: String = message.sender,
-            let thread: SessionThread = try? SessionThread.fetchOne(db, id: targetId)
-        else { return }
-        
-        // Update the configuration
-        //
-        // Note: Messages which had been sent during the previous configuration will still
-        // use it's settings (so if you enable, send a message and then disable disappearing
-        // message then the message you had sent will still disappear)
-        let config: DisappearingMessagesConfiguration = try thread.disappearingMessagesConfiguration
-            .fetchOne(db)
-            .defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id))
-            .with(
-                // If there is no duration then we should disable the expiration timer
-                isEnabled: ((message.duration ?? 0) > 0),
-                durationSeconds: (
-                    message.duration.map { TimeInterval($0) } ??
-                    DisappearingMessagesConfiguration.defaultDuration
-                )
-            )
-        
-        // Add an info message for the user
-        _ = try Interaction(
-            serverHash: nil, // Intentionally null so sync messages are seen as duplicates
-            threadId: thread.id,
-            authorId: sender,
-            variant: .infoDisappearingMessagesUpdate,
-            body: config.messageInfoString(
-                with: (sender != getUserHexEncodedPublicKey(db) ?
-                    Profile.displayName(db, id: sender) :
-                    nil
-                ),
-                isPreviousOff: false
-            ),
-            timestampMs: Int64(message.sentTimestamp ?? 0)   // Default to `0` if not set
-        ).inserted(db)
-        
-        // Finally save the changes to the DisappearingMessagesConfiguration (If it's a duplicate
-        // then the interaction unique constraint will prevent the code from getting here)
-        try config.save(db)
+//        guard
+//            let targetId: String = MessageReceiver.threadInfo(db, message: message, openGroupId: nil)?.id,
+//            let sender: String = message.sender,
+//            let thread: SessionThread = try? SessionThread.fetchOne(db, id: targetId)
+//        else { return }
+//        
+//        // Update the configuration
+//        //
+//        // Note: Messages which had been sent during the previous configuration will still
+//        // use it's settings (so if you enable, send a message and then disable disappearing
+//        // message then the message you had sent will still disappear)
+//        let config: DisappearingMessagesConfiguration = try thread.disappearingMessagesConfiguration
+//            .fetchOne(db)
+//            .defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id))
+//            .with(
+//                // If there is no duration then we should disable the expiration timer
+//                isEnabled: ((message.duration ?? 0) > 0),
+//                durationSeconds: (
+//                    message.duration.map { TimeInterval($0) } ??
+//                    DisappearingMessagesConfiguration.defaultDuration
+//                )
+//            )
+//        
+//        // Add an info message for the user
+//        _ = try Interaction(
+//            serverHash: nil, // Intentionally null so sync messages are seen as duplicates
+//            threadId: thread.id,
+//            authorId: sender,
+//            variant: .infoDisappearingMessagesUpdate,
+//            body: config.messageInfoString(
+//                with: (sender != getUserHexEncodedPublicKey(db) ?
+//                    Profile.displayName(db, id: sender) :
+//                    nil
+//                ),
+//                isPreviousOff: false
+//            ),
+//            timestampMs: Int64(message.sentTimestamp ?? 0)   // Default to `0` if not set
+//        ).inserted(db)
+//        
+//        // Finally save the changes to the DisappearingMessagesConfiguration (If it's a duplicate
+//        // then the interaction unique constraint will prevent the code from getting here)
+//        try config.save(db)
     }
 }