diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index 83b5bd0c2..63c763793 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -258,7 +258,7 @@ export const messageUpload = multer({
     limits: {
         fileSize: Config.get().limits.message.maxAttachmentSize,
         fields: 10,
-        // files: 1
+        files: Config.get().limits.message.maxAttachments,
     },
     storage: multer.memoryStorage(),
 }); // max upload 50 mb
diff --git a/src/util/config/types/subconfigurations/limits/MessageLimits.ts b/src/util/config/types/subconfigurations/limits/MessageLimits.ts
index 50ea32d22..f5b397d14 100644
--- a/src/util/config/types/subconfigurations/limits/MessageLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/MessageLimits.ts
@@ -20,6 +20,7 @@ export class MessageLimits {
     maxCharacters: number = 1048576;
     maxTTSCharacters: number = 160;
     maxReactions: number = 2048;
+    maxAttachments: number = 15;
     maxAttachmentSize: number = 1024 * 1024 * 1024;
     maxBulkDelete: number = 1000;
     maxEmbedDownloadSize: number = 1024 * 1024 * 5;