diff --git a/frontend/src/components/date/DatepickerWithValues.vue b/frontend/src/components/date/DatepickerWithValues.vue
index 6978ea8ae..ae1068b78 100644
--- a/frontend/src/components/date/DatepickerWithValues.vue
+++ b/frontend/src/components/date/DatepickerWithValues.vue
@@ -121,7 +121,7 @@ const showHowItWorks = ref(false)
 
 const flatpickrDate = ref('')
 
-const date = ref<string|Date>('')
+const date = ref<string|Date|null>('')
 
 watch(
 	() => props.modelValue,
@@ -129,9 +129,10 @@ watch(
 		date.value = newValue
 		// Only set the date back to flatpickr when it's an actual date.
 		// Otherwise flatpickr runs in an endless loop and slows down the browser.
-		const parsed = parseDateOrString(date.value, false)
+		const dateValueAsString = date.value instanceof Date ? date.value.toISOString() : date.value
+		const parsed = parseDateOrString(dateValueAsString, false)
 		if (parsed instanceof Date) {
-			flatpickrDate.value = date.value
+			flatpickrDate.value = date.value instanceof Date ? date.value.toISOString() : (date.value ?? '')
 		}
 	},
 )
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 5938976be..e46c7e4aa 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -26,6 +26,7 @@ const PREFIXED_SCSS_STYLES = `@use "sass:math";
 /*
 ** Configure sentry plugin
 */
+// @ts-ignore
 function getSentryConfig(env: ImportMetaEnv): ViteSentryPluginOptions {
 	return {
 		skipEnvironmentCheck: true,