diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index da951eaba..1816fa2fc 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -88,8 +88,8 @@ const to = ref<string>('')
 
 function emitChanged() {
 	emit('dateChanged', {
-		dateFrom: from.value,
-		dateTo: to.value,
+		dateFrom: from.value === '' ? null : from.value,
+		dateTo: to.value === '' ? null : to.value,
 	})
 }