diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index 24a9a72f..5ef0044c 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -376,10 +376,12 @@ public class ApplicationAmendmentRequestDao {
         amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId());
         amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue());
         amendmentDocumentResponse.setValid(amendmentFieldRequest.getValid());
-
-        DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue()));
-        DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity);
-        amendmentDocumentResponse.setFileValue(responseBean);
+        amendmentDocumentResponse.setFileValue(null);
+        if(amendmentFieldRequest.getFileValue()!=null) {
+            DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue()));
+            DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity);
+            amendmentDocumentResponse.setFileValue(List.of(responseBean));
+        }
 
         return amendmentDocumentResponse;
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java
index 528b3492..45680a64 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java
@@ -2,11 +2,13 @@ package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AmendmentDocumentResponse {
 
     private String fieldId;
     private String nameValue;
-    private DocumentResponseBean fileValue;
+    private List<DocumentResponseBean> fileValue;
     private Boolean valid = false;
 }