diff --git a/server/core/lib/object-storage/pre-signed-urls.ts b/server/core/lib/object-storage/pre-signed-urls.ts
index bbb19a57c..8da98e246 100644
--- a/server/core/lib/object-storage/pre-signed-urls.ts
+++ b/server/core/lib/object-storage/pre-signed-urls.ts
@@ -18,7 +18,7 @@ export async function generateWebVideoPresignedUrl (options: {
   const command = new GetObjectCommand({
     Bucket: CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BUCKET_NAME,
     Key: buildKey(key, CONFIG.OBJECT_STORAGE.WEB_VIDEOS),
-    ResponseContentDisposition: `attachment; filename=${downloadFilename}`
+    ResponseContentDisposition: `attachment; filename=${encodeURI(downloadFilename)}`
   })
 
   const url = await getSignedUrl(await getClient(), command, { expiresIn: 3600 * 24 })
@@ -41,7 +41,7 @@ export async function generateHLSFilePresignedUrl (options: {
   const command = new GetObjectCommand({
     Bucket: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET_NAME,
     Key: buildKey(key, CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS),
-    ResponseContentDisposition: `attachment; filename=${downloadFilename}`
+    ResponseContentDisposition: `attachment; filename=${encodeURI(downloadFilename)}`
   })
 
   const url = await getSignedUrl(await getClient(), command, { expiresIn: 3600 * 24 })