diff --git "a/src/api/routes/channels/\043channel_id/messages/\043message_id/index.ts" "b/src/api/routes/channels/\043channel_id/messages/\043message_id/index.ts"
index 52271c8..eed3669 100644
--- "a/src/api/routes/channels/\043channel_id/messages/\043message_id/index.ts"
+++ "b/src/api/routes/channels/\043channel_id/messages/\043message_id/index.ts"
@@ -189,7 +189,7 @@
 
         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 e91e70a..964f48f 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -176,6 +176,7 @@
         width: attEnt.width,
         content_type: attEnt.contentType || attEnt.userOriginalContentType,
         channel_id: channel.id,
+        message_id: messageId,
     });
     await realAtt.save();
 
@@ -404,6 +405,7 @@
                     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 };