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 1a878390955..0689c0c5e61 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
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -1028,7 +1029,10 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
 					onsetSymptom.removeItem(sourceField.getCaption());
 					boolean isOnsetDateFieldEnabled = isAnySymptomSetToYes(getFieldGroup(), allPropertyIds, Arrays.asList(SymptomState.YES));
 					onsetDateField.setEnabled(isOnsetDateFieldEnabled);
-					if (!isOnsetDateFieldEnabled) {
+					Date onsetDate = getValue().getOnsetDate();
+					if (onsetDate != null) {
+						onsetDateField.setValue(onsetDate);
+					} else if (!isOnsetDateFieldEnabled) {
 						onsetDateField.setValue(null);
 					}
 				}