diff --git a/src/ui/components/FieldControl/FieldControl.svelte b/src/ui/components/FieldControl/FieldControl.svelte
index aea35e22..e427c22d 100644
--- a/src/ui/components/FieldControl/FieldControl.svelte
+++ b/src/ui/components/FieldControl/FieldControl.svelte
@@ -25,7 +25,7 @@
 
   export let field: DataField;
   export let value: Optional<DataValue>;
-  let cachedValue: Optional<Date>; // store the proposing value
+  let cachedValue: Optional<Date> = isDate(value) ? value : null; // store the proposing value
   export let onChange: (value: Optional<DataValue>) => void;
   export let readonly: boolean = false;