diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
index 5023e960f..008a58fff 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
@@ -200,8 +200,11 @@ public class DownloadController implements DownloadResource {
     public CompletableFuture<ResponseEntity<InputStreamResource>> downloadFile(@RequestParam(STORAGE_ID) String storageId,
                                                                                @RequestParam(value = "inline", required = false, defaultValue = FALSE) boolean inline) {
         var userId = KeycloakSecurity.getUserId();
+        var tenantId = TenantContext.getTenantId();
+
         return CompletableFuture.supplyAsync(() -> {
 
+            TenantContext.setTenantId(tenantId);
             var downloadStatus = getDownloadStatus(storageId, userId);
             var fileDownloadStream = getFileForDownload(storageId, userId);