diff --git a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
index 522bd5169..2b1f62abc 100644
--- a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
+++ b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
@@ -86,6 +86,11 @@ public final class VisibleMessage : Message {
         let attachmentProtos = attachments.compactMap { $0.buildProto() }
         dataMessage.setAttachments(attachmentProtos)
         // TODO: Contact
+        // Expiration timer
+        // TODO: We * want * expiration timer updates to be explicit. But currently Android will disable the expiration timer for a conversation
+        // if it receives a message without the current expiration timer value attached to it...
+        let expiration = OWSDisappearingMessagesConfiguration.fetch(uniqueId: threadID!, transaction: transaction)?.durationSeconds ?? 0
+        dataMessage.setExpireTimer(expiration)
         // Group context
         do {
             try setGroupContextIfNeeded(on: dataMessage, using: transaction)