diff --git a/src/components/Event/EventDatePicker.vue b/src/components/Event/EventDatePicker.vue
index 4cbe221b5..7c2fe5040 100644
--- a/src/components/Event/EventDatePicker.vue
+++ b/src/components/Event/EventDatePicker.vue
@@ -1,6 +1,12 @@
 <template>
+  <!-- 
+   :key is required to force rerender when time change
+   If not used, the input becomes empty
+   See : https://vuejs.org/api/built-in-special-attributes.html#key
+    -->
   <input
-    type="datetime-local"
+    :type="time ? 'datetime-local' : 'date'"
+    :key="time.toString()"
     class="rounded invalid:border-red-500"
     v-model="component"
     :min="computeMin"
@@ -13,6 +19,7 @@ import { computed } from "vue";
 const props = withDefaults(
   defineProps<{
     modelValue: Date | null;
+    time: boolean;
     min?: Date | null | undefined;
   }>(),
   {
@@ -25,7 +32,7 @@ const emit = defineEmits(["update:modelValue", "blur"]);
 /** Format a Date to 'YYYY-MM-DDTHH:MM' based on local time zone */
 const UTCToLocal = (date: Date) => {
   const localDate = new Date(date.getTime() - date.getTimezoneOffset() * 60000);
-  return localDate.toISOString().slice(0, 16);
+  return localDate.toISOString().slice(0, props.time ? 16 : 10);
 };
 
 const component = computed({
@@ -36,12 +43,16 @@ const component = computed({
     return UTCToLocal(props.modelValue);
   },
   set(value) {
-    console.log("value" + value);
     if (!value) {
       emit("update:modelValue", null);
       return;
     }
     const date = new Date(value);
+
+    if (!props.time) {
+      date.setHours(0, 0, 0, 0);
+    }
+
     emit("update:modelValue", date);
   },
 });
diff --git a/src/views/Event/EditView.vue b/src/views/Event/EditView.vue
index 1dc5f2125..0896ecf36 100644
--- a/src/views/Event/EditView.vue
+++ b/src/views/Event/EditView.vue
@@ -67,6 +67,7 @@
         label-for="begins-on-field"
       >
         <event-date-picker
+          :time="eventOptions.showStartTime"
           v-model="beginsOn"
           @blur="consistencyBeginsOnBeforeEndsOn"
         ></event-date-picker>
@@ -83,6 +84,7 @@
         class="items-center"
       >
         <event-date-picker
+          :time="eventOptions.showEndTime"
           v-model="endsOn"
           @blur="consistencyBeginsOnBeforeEndsOn"
           :min="beginsOn"