diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index 1b252d5b06..b90882449f 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -67,6 +67,12 @@
 
   const removeFilter = id => {
     filters = filters.filter(field => field.id !== id)
+
+    // Clear all filters when no fields are specified
+    let [first] = filters
+    if (filters.length == 1 && first?.onEmptyFilter) {
+      filters = []
+    }
   }
 
   const duplicateFilter = id => {