diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index c0ad6ca2..01aa9988 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -2225,13 +2225,18 @@ public class ApplicationEvaluationDao {
         if (evaluationFormEntity == null) {
             return;
         }
-        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = getApplicationEvaluationFormOrCreate(evaluationFormEntity, entity);
         List<ContentResponseBean> contentResponseBeans = evaluationFormDao
                 .convertEvaluationFormEntityToEvaluationFormResponseBean(evaluationFormEntity)
                 .getContent();
         if (CollectionUtils.isEmpty(contentResponseBeans)) {
             return;
         }
+        boolean evaluationFormHasSpreadsheet = contentResponseBeans.stream()
+                .anyMatch(c -> GepafinConstant.SPREADSHEET.equals(c.getName()));
+        if (!evaluationFormHasSpreadsheet) {
+            return;
+        }
+        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = getApplicationEvaluationFormOrCreate(evaluationFormEntity, entity);
         List<ApplicationFormFieldRequestBean> spreadsheetUpdates = new ArrayList<>();
         for (ContentResponseBean contentResponseBean : contentResponseBeans) {
             if (!GepafinConstant.SPREADSHEET.equals(contentResponseBean.getName())) {