diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
index 217b959..4389201 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
@@ -724,14 +724,14 @@ public class CreateDatasetForm extends Composite{
 
 			// prepare custom fields
 			for (MetaDataFieldSkeleton field : listOfMetadataFields) {
-				
+
 				MetadataFieldWrapper originalField = field.getField();
-				
+
 				String value = originalField.getType().equals(DataType.Time_Interval) || originalField.getType().equals(DataType.Times_ListOf) ? 
 						field.getTimeIntervalOrTimeListWithoutMissing() : field.getFieldCurrentValue();
 
-				if(!value.isEmpty())
-					customFieldsMap.put(field.getFieldName(), field.getFieldCurrentValue());
+						if(!value.isEmpty())
+							customFieldsMap.put(field.getFieldName(), field.getFieldCurrentValue());
 
 			}
 
@@ -739,7 +739,8 @@ public class CreateDatasetForm extends Composite{
 
 				String key = customEntry.getKey();
 				String value = customEntry.getValue();
-				customFieldsMap.put(key, value);
+				if(value != null && !value.isEmpty())
+					customFieldsMap.put(key, value);
 
 			}