diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 8235b9417..b4c5fcaea 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -433,7 +433,7 @@ public final class MessageSender {
             )
             .done(on: DispatchQueue.global(qos: .default)) { responseInfo, data in
                 message.openGroupServerMessageId = UInt64(data.id)
-                let serverTimestampMs: UInt64? = (data.posted == nil) ? nil : UInt64(floor(data.posted! * 1000))
+                let serverTimestampMs: UInt64? = data.posted.map { UInt64(floor($0 * 1000)) }
                 
                 dependencies.storage.write { db in
                     // The `posted` value is in seconds but we sent it in ms so need that for de-duping