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 21f77ba..fd5a25d 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
@@ -528,6 +528,8 @@ public class CreateDatasetForm extends Composite{
 		}else{ 
 			// just hide this listbox
 			metadataProfilesControlGroup.setVisible(false);
+			metadataFieldsPanel.clear();
+			listOfMetadataFields.clear();
 		}
 	}