diff --git a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
index 5b0b69bb3..0c4dbf7d5 100644
--- a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
+++ b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
@@ -23,7 +23,7 @@
               <ng-container *ngTemplateOutlet="queryExpression; context: { query: query }"></ng-container>
             }
           }
-          <button class="btn btn-link btn-sm pe-0" type="button" (click)="removeQuery(i)" [disabled]="disabled">
+          <button class="btn btn-link btn-sm pe-0" type="button" (click)="removeComponent(query)" [disabled]="disabled">
             <i-bs name="x"></i-bs>
           </button>
         </div>
@@ -80,7 +80,7 @@
               <ng-container *ngTemplateOutlet="queryExpression; context: { query: subquery }"></ng-container>
             }
           }
-          <button class="btn btn-link btn-sm pe-0" type="button" (click)="removeQuery(i)" [disabled]="disabled">
+          <button class="btn btn-link btn-sm pe-0" type="button" (click)="removeComponent(subquery)" [disabled]="disabled">
             <i-bs name="x"></i-bs>
           </button>
         </div>
diff --git a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.ts
index 3b872b5c2..5bb94e348 100644
--- a/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.ts
+++ b/src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.ts
@@ -126,12 +126,6 @@ export class CustomFieldQueriesModel {
     })
   }
 
-  public removeQuery(index: number) {
-    const query = this.queries.splice(index, 1)[0]
-    query.changed.complete()
-    this.changed.next(this)
-  }
-
   public addExpression(
     expression: CustomFieldQueryExpression = new CustomFieldQueryExpression()
   ) {
@@ -146,6 +140,51 @@ export class CustomFieldQueriesModel {
       this.changed.next(this)
     })
   }
+
+  private findComponent(
+    queryComponent: CustomFieldQueryAtom | CustomFieldQueryExpression,
+    components: any[]
+  ) {
+    for (let i = 0; i < components.length; i++) {
+      if (components[i] === queryComponent) {
+        return components.splice(i, 1)[0]
+      } else if (
+        components[i].type === CustomFieldQueryComponentType.Expression
+      ) {
+        let found = this.findComponent(
+          queryComponent,
+          components[i].value as any[]
+        )
+        if (found !== undefined) {
+          return found
+        }
+      }
+    }
+    return undefined
+  }
+
+  public removeComponent(
+    queryComponent: CustomFieldQueryAtom | CustomFieldQueryExpression
+  ) {
+    let foundComponent
+    for (let i = 0; i < this.queries.length; i++) {
+      let query = this.queries[i]
+      if (query === queryComponent) {
+        foundComponent = this.queries.splice(i, 1)[0]
+        break
+      } else if (query.type === CustomFieldQueryComponentType.Expression) {
+        let found = this.findComponent(queryComponent, query.value as any[])
+        if (found !== undefined) {
+          foundComponent = found
+        }
+      }
+    }
+    if (foundComponent === undefined) {
+      return
+    }
+    foundComponent.changed.complete()
+    this.changed.next(this)
+  }
 }
 
 @Component({
@@ -228,8 +267,10 @@ export class CustomFieldsLookupDropdownComponent {
     this.selectionModel.addExpression()
   }
 
-  public removeQuery(index: number) {
-    this.selectionModel.removeQuery(index)
+  public removeComponent(
+    component: CustomFieldQueryAtom | CustomFieldQueryExpression
+  ) {
+    this.selectionModel.removeComponent(component)
   }
 
   getOperatorsForField(field: CustomField): string[] {