diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
index 973e20e2e..54ba6b4e6 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -233,15 +233,11 @@ router.put(
 
         // no await as it shouldnt block the message send function and silently catch error
         postHandleMessage(message).catch((e) => console.error("[Message] post-message handler failed", e));
-
-        return res.json(
-            message.withSignedAttachments(
-                new NewUrlUserSignatureData({
-                    ip: req.ip,
-                    userAgent: req.headers["user-agent"] as string,
-                }),
-            ),
-        );
+        const sign = new NewUrlUserSignatureData({
+            ip: req.ip,
+            userAgent: req.headers["user-agent"] as string,
+        });
+        return res.json(Message.prototype.withSignedComponents.call(message.withSignedAttachments(sign), sign));
     },
 );