diff --git a/api/server/routes/files/multer.js b/api/server/routes/files/multer.js
index 71a820ba54..2162a0d807 100644
--- a/api/server/routes/files/multer.js
+++ b/api/server/routes/files/multer.js
@@ -15,6 +15,7 @@ const storage = multer.diskStorage({
   },
   filename: function (req, file, cb) {
     req.file_id = crypto.randomUUID();
+    file.originalname = decodeURIComponent(file.originalname);
     cb(null, `${file.originalname}`);
   },
 });
diff --git a/client/src/hooks/Files/useFileHandling.ts b/client/src/hooks/Files/useFileHandling.ts
index c288c912af..2b448e4988 100644
--- a/client/src/hooks/Files/useFileHandling.ts
+++ b/client/src/hooks/Files/useFileHandling.ts
@@ -125,7 +125,7 @@ const useFileHandling = (params?: UseFileHandling) => {
     startUploadTimer(extendedFile.file_id, extendedFile.file?.name || 'File');
 
     const formData = new FormData();
-    formData.append('file', extendedFile.file as File);
+    formData.append('file', extendedFile.file as File, encodeURIComponent(extendedFile.file?.name || 'File'));
     formData.append('file_id', extendedFile.file_id);
     if (extendedFile.width) {
       formData.append('width', extendedFile.width?.toString());