diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index d03002bd..f63d2470 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -979,6 +979,7 @@ public class ApplicationDao {
         return getApplicationResponse(applicationEntity);
     }
     public byte[] downloadApplicationDocumentsAsZip(HttpServletRequest request,Long applicationId) {
+        ApplicationEntity applicationEntity = validateApplication(applicationId);
         AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
 
         List<ApplicationFormEntity> applicationForms = applicationFormRepository.findByApplicationId(applicationId);
@@ -1014,7 +1015,7 @@ public class ApplicationDao {
              ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) {
 
             for (DocumentEntity document : documents) {
-                String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION, applicationId, 0L);
+                String s3Folder = s3PathConfig.generateDocumentPath(DocumentSourceTypeEnum.APPLICATION,   applicationEntity.getCall().getId(), applicationId);
                 try (InputStream fileInputStream = amazonS3Service.getFile(s3Folder, document.getFilePath())) {
                     String fileName = Utils.extractFileName(document.getFilePath());
                     zos.putNextEntry(new ZipEntry(fileName));