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 903e2ba9a..5023e960f 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
@@ -199,8 +199,8 @@ public class DownloadController implements DownloadResource {
     @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
     public CompletableFuture<ResponseEntity<InputStreamResource>> downloadFile(@RequestParam(STORAGE_ID) String storageId,
                                                                                @RequestParam(value = "inline", required = false, defaultValue = FALSE) boolean inline) {
+        var userId = KeycloakSecurity.getUserId();
         return CompletableFuture.supplyAsync(() -> {
-            var userId = KeycloakSecurity.getUserId();
 
             var downloadStatus = getDownloadStatus(storageId, userId);
             var fileDownloadStream = getFileForDownload(storageId, userId);