diff --git a/frontend/components/Form/DatePicker.vue b/frontend/components/Form/DatePicker.vue
index e8b73ae..2a681ea 100644
--- a/frontend/components/Form/DatePicker.vue
+++ b/frontend/components/Form/DatePicker.vue
@@ -72,9 +72,14 @@
       return null;
     },
     set(value: Date | null) {
-      // emit update:modelValue with a Date object or null
       console.debug("DatePicker: SET", value);
-      emit("update:modelValue", value ? new Date(value) : null);
+      if (value instanceof Date) {
+        value = datelib.zeroTime(value);
+        emit("update:modelValue", value);
+      } else {
+        value = value ? datelib.zeroTime(new Date(value)) : null;
+        emit("update:modelValue", value);
+      }
     },
   });
 </script>