diff --git a/app/src/components/v-date-picker/v-date-picker.vue b/app/src/components/v-date-picker/v-date-picker.vue
index 9728aac523..a0cc5042a9 100644
--- a/app/src/components/v-date-picker/v-date-picker.vue
+++ b/app/src/components/v-date-picker/v-date-picker.vue
@@ -63,6 +63,9 @@ export default defineComponent({
 
 		onBeforeUnmount(() => {
 			if (flatpickr) {
+				const selectedDate = flatpickr.selectedDates.length > 0 ? flatpickr.selectedDates[0] : null;
+				emitValue(selectedDate);
+
 				flatpickr.destroy();
 				flatpickr = null;
 			}