diff --git a/src/components/expense-form.tsx b/src/components/expense-form.tsx
index c1652ca..cfc749a 100644
--- a/src/components/expense-form.tsx
+++ b/src/components/expense-form.tsx
@@ -165,9 +165,7 @@ export function ExpenseForm({
                     <Input
                       className="date-base"
                       type="date"
-                      value={(field.value ?? new Date())
-                        .toISOString()
-                        .substring(0, 10)}
+                      defaultValue={formatDate(field.value)}
                       onChange={(event) => {
                         return field.onChange(new Date(event.target.value))
                       }}
@@ -552,3 +550,8 @@ export function ExpenseForm({
     </Form>
   )
 }
+
+function formatDate(date?: Date) {
+  if (!date || isNaN(date as any)) date = new Date()
+  return date.toISOString().substring(0, 10)
+}