diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index f7a78ce61..cde012889 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -272,6 +272,10 @@ public final class MessageSender : NSObject {
             #endif
         }
         guard message.isValid else { handleFailure(with: Error.invalidMessage, using: transaction); return promise }
+        // The back-end doesn't accept messages without a body so we use this as a workaround
+        if message.text?.isEmpty != false {
+            message.text = String(message.sentTimestamp!)
+        }
         // Convert the message to an open group message
         let (channel, server) = { () -> (UInt64, String) in
             switch destination {