diff --git a/MicrobotApi/Controllers/FileController.cs b/MicrobotApi/Controllers/FileController.cs
index 0065e46..566ef2f 100644
--- a/MicrobotApi/Controllers/FileController.cs
+++ b/MicrobotApi/Controllers/FileController.cs
@@ -1,4 +1,5 @@
-using Azure;
+using System.Web;
+using Azure;
 using Azure.Storage.Blobs.Models;
 using MicrobotApi.Database;
 using MicrobotApi.Models;
@@ -63,6 +64,6 @@ public async Task<IActionResult> Download(string path)
     {
         var file = await _azureStorageService.DownloadFile(path);
             
-        return File(file.Value.Content, "application/octet-stream", Path.GetFileName(path));
+        return File(file.Value.Content, "application/octet-stream", Path.GetFileName(HttpUtility.UrlDecode(path)));
     }
 }
\ No newline at end of file
diff --git a/MicrobotApi/Services/AzureStorageService.cs b/MicrobotApi/Services/AzureStorageService.cs
index 0eca0d6..e552369 100644
--- a/MicrobotApi/Services/AzureStorageService.cs
+++ b/MicrobotApi/Services/AzureStorageService.cs
@@ -43,7 +43,7 @@ public static Uri GetSasUri(BlobBaseClient blobClient)
     public Task<Response<BlobDownloadInfo>> DownloadFile(string storagePath)
     {
         var containerClient = _blobServiceClient.GetBlobContainerClient(BlobContainer);
-        var blobClient = containerClient.GetBlobClient(storagePath);
+        var blobClient = containerClient.GetBlobClient(HttpUtility.UrlDecode(storagePath));
         
         var blobData =  blobClient.DownloadAsync();