diff --git a/frontend/src/components/project/partials/FilterInput.vue b/frontend/src/components/project/partials/FilterInput.vue
index 8718a2227..5a08d6856 100644
--- a/frontend/src/components/project/partials/FilterInput.vue
+++ b/frontend/src/components/project/partials/FilterInput.vue
@@ -64,7 +64,10 @@ watch(
 	},
 )
 
-function escapeHtml(unsafe: string): string {
+function escapeHtml(unsafe: string|null|undefined): string {
+	if (!unsafe) {
+		return ''
+	}
 	return unsafe
 		.replace(/&/g, '&')
 		.replace(/</g, '&lt;')
@@ -73,7 +76,10 @@ function escapeHtml(unsafe: string): string {
 		.replace(/'/g, '&#039;')
 }
 
-function unEscapeHtml(unsafe: string): string {
+function unEscapeHtml(unsafe: string|null|undefined): string {
+	if (!unsafe) {
+		return ''
+	}
 	return unsafe
 		.replace(/&amp;/g, '&')
 		.replace(/&lt;/g, '<')
diff --git a/frontend/src/components/project/views/ViewEditForm.vue b/frontend/src/components/project/views/ViewEditForm.vue
index b537f224e..13dcc1e9b 100644
--- a/frontend/src/components/project/views/ViewEditForm.vue
+++ b/frontend/src/components/project/views/ViewEditForm.vue
@@ -77,10 +77,10 @@ function save() {
 
 	emit('update:modelValue', {
 		...view.value,
-		filter: transformFilterForApi(view.value?.filter || ''),
+		filter: transformFilterForApi(view.value?.filter?.filter || ''),
 		bucketConfiguration: view.value?.bucketConfiguration.map(bc => ({
 			title: bc.title,
-			filter: transformFilterForApi(bc.filter || ''),
+			filter: transformFilterForApi(bc.filter?.filter || ''),
 		})),
 	})
 }
@@ -233,7 +233,7 @@ function handleBubbleSave() {
 						</div>
 
 						<FilterInput
-							v-model="view.bucketConfiguration[index].filter"
+							v-model="view.bucketConfiguration[index].filter.filter"
 							:project-id="view.projectId"
 							:input-label="$t('project.views.filter')"
 							class="mb-2"