diff --git a/src/components/admin/editors/FormerNamesEditor.tsx b/src/components/admin/editors/FormerNamesEditor.tsx
index ba4da1ac..f472a4cb 100644
--- a/src/components/admin/editors/FormerNamesEditor.tsx
+++ b/src/components/admin/editors/FormerNamesEditor.tsx
@@ -96,7 +96,7 @@ export function FormerNamesEditor({ names, onChange, currentName }: FormerNamesE
                           <Label className="text-xs">Date Changed</Label>
                           <DatePicker
                             date={name.date_changed ? new Date(name.date_changed) : undefined}
-                            onSelect={(date) => updateName(actualIndex, 'date_changed', date)}
+                            onSelect={(date) => updateName(actualIndex, 'date_changed', date || undefined)}
                           />
                         </div>
 
diff --git a/src/components/reviews/ReviewForm.tsx b/src/components/reviews/ReviewForm.tsx
index ba745a59..70107e84 100644
--- a/src/components/reviews/ReviewForm.tsx
+++ b/src/components/reviews/ReviewForm.tsx
@@ -175,7 +175,7 @@ export function ReviewForm({
             <Label>Visit Date</Label>
             <DatePicker
               date={watch('visit_date') ? new Date(watch('visit_date')) : undefined}
-              onSelect={(date) => setValue('visit_date', date ? date.toISOString().split('T')[0] : '')}
+              onSelect={(date) => setValue('visit_date', date ? date.toISOString().split('T')[0] : undefined)}
               placeholder="When did you visit?"
               disableFuture={true}
               fromYear={1950}