diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 5aa8701a1..c526cb0ea 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -1368,7 +1368,7 @@ namespace IRaCIS.Core.API.Controllers
                                 var fileName = GetEntryFileName(reportUrl, "Report", existingEntryPaths.Count + 1);
                                 var entryPath = BuildUniqueEntryPath(existingEntryPaths, folderName, fileName);
 
-                                await using (var source = await _oSSService.GetStreamFromOSSAsync(HttpUtility.UrlDecode(reportUrl)))
+                                await using (var source = await _oSSService.GetStreamFromOSSAsync(HttpUtility.UrlEncode(reportUrl)))
                                 {
                                     var entry = zip.CreateEntry(entryPath, CompressionLevel.Fastest);
 
@@ -1394,7 +1394,7 @@ namespace IRaCIS.Core.API.Controllers
                                 var entryPath = BuildUniqueEntryPath(existingEntryPaths, folderName, fileName);
 
 
-                                await using (var source = await _oSSService.GetStreamFromOSSAsync(HttpUtility.UrlDecode(imageUrl)))
+                                await using (var source = await _oSSService.GetStreamFromOSSAsync(HttpUtility.UrlEncode(imageUrl)))
                                 {
                                     var entry = zip.CreateEntry(entryPath, CompressionLevel.Fastest);