diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
index d36ba6805b9..1a878390955 100644
--- a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
+++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
@@ -1026,7 +1026,11 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
 					onsetDateField.setEnabled(true);
 				} else {
 					onsetSymptom.removeItem(sourceField.getCaption());
-					onsetDateField.setEnabled(isAnySymptomSetToYes(getFieldGroup(), allPropertyIds, Arrays.asList(SymptomState.YES)));
+					boolean isOnsetDateFieldEnabled = isAnySymptomSetToYes(getFieldGroup(), allPropertyIds, Arrays.asList(SymptomState.YES));
+					onsetDateField.setEnabled(isOnsetDateFieldEnabled);
+					if (!isOnsetDateFieldEnabled) {
+						onsetDateField.setValue(null);
+					}
 				}
 				onsetSymptom.setEnabled(!onsetSymptom.getItemIds().isEmpty());
 			});