diff --git a/resources/ts/components/DateInput.vue b/resources/ts/components/DateInput.vue
index 73c3280..1d7a6c6 100644
--- a/resources/ts/components/DateInput.vue
+++ b/resources/ts/components/DateInput.vue
@@ -1,24 +1,28 @@
 <script setup lang="ts">
+import { parseDateInput, formatDateInput } from "@/lib/dates";
+
 const emit = defineEmits<(e: "input"|"change", value: Date) => void>();
 
 const date = defineModel<Date>({ required: true });
 
+
 function onInput(event: Event) {
     const inputValue = (event.target as HTMLInputElement).value;
-    date.value =  new Date(inputValue);
+    date.value = parseDateInput(inputValue);
+
     emit('input', date.value);
 }
 
 function onChange(event: Event) {
     const inputValue = (event.target as HTMLInputElement).value;
-    date.value =  new Date(inputValue);
+    date.value = parseDateInput(inputValue);
     emit('change', date.value);
 }
 </script>
 
 <template>
     <input
-        :value="date.toISOString().substring(0, 10)"
+        :value="formatDateInput(date)"
         type="date"
         @input="onInput"
         @change="onChange"
diff --git a/resources/ts/lib/dates.ts b/resources/ts/lib/dates.ts
index 1376ddc..df98591 100644
--- a/resources/ts/lib/dates.ts
+++ b/resources/ts/lib/dates.ts
@@ -1,6 +1,22 @@
 import { formatDistanceToNow } from "date-fns";
 import { enUS, fr } from "date-fns/locale";
 
+export function parseDateInput(rawDate: string): Date {
+    const parts = rawDate.split('-').map(part => parseInt(part, 10));
+    if (!parts[0] || !parts[1] || !parts[2]) {
+        return new Date(new Date().setHours(0, 0, 0, 0))
+    }
+    return new Date(parts[0], parts[1] - 1, parts[2]);
+}
+
+export function formatDateInput(date: Date): string {
+    return [
+        date.getFullYear().toFixed(0),
+        (date.getMonth() + 1).toFixed(0).padStart(2, '0'),
+        (date.getDate()).toFixed(0).padStart(2, '0'),
+    ].join('-');
+}
+
 export function relativeTime(date: Date, locale: string): string {
     return formatDistanceToNow(date, {
         addSuffix: true,