diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 62323d65..694d196b 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -565,9 +565,15 @@ public class ApplicationEvaluationDao {
         if (existingEntityOptional.isPresent()) {
             entity = existingEntityOptional.get();
             oldApplicationEvaluation = Utils.getClonedEntityForData(entity);
+            if(req.getCriteria()!=null) {
             entity.setCriteria(Utils.convertObjectToJson(processCriteria(entity, req)));
+            }
+            if(req.getChecklist()!=null) {
             entity.setChecklist(Utils.convertObjectToJson(processChecklist(entity, req)));
+            }
+            if(req.getFiles()!=null) {
             entity.setFile(Utils.convertObjectToJson(processField(entity, req)));
+            }
             entity.setIsDeleted(false);
             setIfUpdated(entity::getNote, entity::setNote, req.getNote());
             setIfUpdated(entity::getMotivation, entity::setMotivation, req.getMotivation());