diff --git a/components/form/shared/form-date-picker.tsx b/components/form/shared/form-date-picker.tsx
index fd6c9acc..cf7e959b 100644
--- a/components/form/shared/form-date-picker.tsx
+++ b/components/form/shared/form-date-picker.tsx
@@ -202,7 +202,7 @@ export function FormDatePicker<
                   <Calendar
                     initialFocus
                     mode={mode}
-                    defaultMonth={mode === 'range' && 'from' in selectedDate ? selectedDate.from : selectedDate}
+                    defaultMonth={mode === 'range' && selectedDate && 'from' in selectedDate ? selectedDate.from : selectedDate}
                     selected={selectedDate}
                     onSelect={field.onChange}
                     numberOfMonths={numberOfMonths}