diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
index d6d7320ab..f54086649 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
@@ -143,7 +143,9 @@ public class PrefillingMapper {
                     case COMBO_BOX:
                         if (parsedValues.isEmpty())
                             parsedValues.add(parsedValue);
-                        properties.put(id, parseComboBoxValues(node, parsedValues));
+                        if (!parsedValues.stream().allMatch(Objects::isNull)) {
+                            properties.put(id, parseComboBoxValues(node, parsedValues));
+                        }
                         break;
                     case TAGS:
                         properties.put(id, mapper.valueToTree(parseTags(parsedValue)).toString());