diff --git a/frontend/src/components/date/DatepickerWithValues.vue b/frontend/src/components/date/DatepickerWithValues.vue
index 26b37413c..b68e7d293 100644
--- a/frontend/src/components/date/DatepickerWithValues.vue
+++ b/frontend/src/components/date/DatepickerWithValues.vue
@@ -91,18 +91,18 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import DatemathHelp from '@/components/date/DatemathHelp.vue'
 import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage'
 
-const props = defineProps({
-	modelValue: {
-		required: false,
-		default: null,
-	},
-	open: {
-		type: Boolean,
-		default: false,
-	},
+const props = withDefaults(defineProps<{
+	modelValue: string | Date | null,
+	open: boolean
+}>(), {
+	modelValue: null,
+	open: false,
 })
 
-const emit = defineEmits(['update:modelValue', 'close'])
+const emit = defineEmits<{
+	'update:modelValue': [value: string | Date | null],
+	'update:open': [open: boolean],
+}>()
 
 const {t} = useI18n({useScope: 'global'})
 
diff --git a/frontend/src/components/project/partials/FilterInput.vue b/frontend/src/components/project/partials/FilterInput.vue
index dc55776dd..bc18879d7 100644
--- a/frontend/src/components/project/partials/FilterInput.vue
+++ b/frontend/src/components/project/partials/FilterInput.vue
@@ -304,8 +304,7 @@ const blurDebounced = useDebounceFn(() => emit('blur'), 500)
 					/>
 					<DatepickerWithValues
 						v-model="currentDatepickerValue"
-						:open="datePickerPopupOpen"
-						@close="() => datePickerPopupOpen = false"
+						v-model:open="datePickerPopupOpen"
 						@update:modelValue="updateDateInQuery"
 					/>
 				</div>