diff --git a/api-gateway/src/api/service/artifact.ts b/api-gateway/src/api/service/artifact.ts
index cd936d83e4..c5e5e83839 100644
--- a/api-gateway/src/api/service/artifact.ts
+++ b/api-gateway/src/api/service/artifact.ts
@@ -187,7 +187,7 @@ export class ArtifactApi {
     async uploadArtifacts(@Req() req, @UploadedFiles() files): Promise<any> {
         try {
             if (!files) {
-                throw new HttpException('There are no files to upload', HttpStatus.UNPROCESSABLE_ENTITY)
+                throw new HttpException('There are no files to upload', HttpStatus.BAD_REQUEST)
             }
             const owner = req.user.did;
             const parentId = req.params.parentId;
diff --git a/api-gateway/src/helpers/interceptors/multipart.ts b/api-gateway/src/helpers/interceptors/multipart.ts
index 1a57aa19e9..714894fcb4 100644
--- a/api-gateway/src/helpers/interceptors/multipart.ts
+++ b/api-gateway/src/helpers/interceptors/multipart.ts
@@ -15,24 +15,28 @@ export function AnyFilesInterceptor(options: MultipartOptions = {}): Type<NestIn
       const req = context.switchToHttp().getRequest() as FastifyRequest;
 
       if (!req.isMultipart()) {
-        throw new HttpException('The request should be a form-data', HttpStatus.BAD_REQUEST)
+        throw new HttpException('The request should be a form-data', HttpStatus.BAD_REQUEST);
       }
 
       const files: MultipartFile[] = [];
       const body = {};
 
       for await (const part of req.parts()) {
-        if (part.type !== 'file') {
-          body[part.fieldname] = (part as MultipartValue).value;
+        const { type, fieldname } = part;
+
+        if (type !== 'file') {
+          body[fieldname] = (part as MultipartValue).value;
           continue;
         }
 
-        const file: MultipartFile = await getFileFromPart(part);
+        const file: MultipartFile | null = await getFileFromPart(part);
 
-        files.push(file);
+        if (file) {
+          files.push(file);
+        }
       }
 
-      if(files.length) {
+      if (files.length) {
         req.storedFiles = files;
       }
 
diff --git a/api-gateway/src/helpers/interceptors/utils/multipart.ts b/api-gateway/src/helpers/interceptors/utils/multipart.ts
index 869c88cd06..2c4016bf4e 100644
--- a/api-gateway/src/helpers/interceptors/utils/multipart.ts
+++ b/api-gateway/src/helpers/interceptors/utils/multipart.ts
@@ -1,17 +1,25 @@
-import { MultipartFile as MultipartFileFastify} from '@fastify/multipart';
+import { MultipartFile as MultipartFileFastify } from '@fastify/multipart';
 
 //types and interfaces
 import { MultipartFile } from '../types/index.js';
 
-export const getFileFromPart = async (part: MultipartFileFastify): Promise<MultipartFile> => {
-  const buffer: Buffer = await part.toBuffer()
+export const getFileFromPart = async (part: MultipartFileFastify): Promise<MultipartFile | null> => {
+  const buffer: Buffer = await part.toBuffer();
+
+  const { byteLength: size } = buffer;
+  const { filename, mimetype, fieldname, encoding } = part;
+
+  if (!size || !fieldname) {
+    return null;
+  }
+
   return {
     buffer,
-    size: buffer.byteLength,
-    filename: part.filename,
-    mimetype: part.mimetype,
-    fieldname: part.fieldname,
-    encoding: part.encoding,
-    originalname: part.fieldname
+    size,
+    filename,
+    mimetype,
+    fieldname,
+    encoding,
+    originalname: fieldname,
   };
 };
\ No newline at end of file