2 files changed, 3 insertions, 1 deletions
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 52271c83..eed36691 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
@@ -189,7 +189,7 @@ router.put(
 
         if (req.file) {
             try {
-                const file = await uploadFile(`/attachments/${req.params.channel_id}`, req.file);
+                const file = await uploadFile(`/attachments/${req.params.channel_id}/${message_id}`, req.file);
                 attachments.push(Attachment.create(file));
             } catch (error) {
                 return res.status(400).json(error);
diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index e91e70a8..964f48f0 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -176,6 +176,7 @@ async function processMedia(media: UnfurledMediaItem, messageId: string, batchId
         width: attEnt.width,
         content_type: attEnt.contentType || attEnt.userOriginalContentType,
         channel_id: channel.id,
+        message_id: messageId,
     });
     await realAtt.save();
 
@@ -404,6 +405,7 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
                     width: attEnt.width,
                     content_type: attEnt.contentType || attEnt.userOriginalContentType,
                     channel_id: channel.id,
+                    message_id: message.id,
                 });
                 await realAtt.save();
                 return { attachment: realAtt, index: att.index };