diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts
index 4b3c1e9e1..e5ceb8dec 100644
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts
@@ -281,10 +281,10 @@ describe('CustomFieldsQueryDropdownComponent', () => {
           [4, 'icontains', 'test'],
         ],
       ])
-      expression2.addAtom(atom)
+      expression.addAtom(atom)
       expression2.addExpression(expression)
       model.addExpression(expression2)
-      model.removeElement(expression)
+      model.removeElement(atom)
       expect(model.queries.length).toBe(1)
       model.removeElement(expression2)
     })
diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
index e2228bd57..b1a6befb5 100644
--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
@@ -103,6 +103,11 @@ export class CustomFieldQueriesModel {
     for (let i = 0; i < elements.length; i++) {
       if (elements[i] === queryElement) {
         return elements.splice(i, 1)[0]
+      } else if (elements[i].type === CustomFieldQueryElementType.Expression) {
+        return this.findElement(
+          queryElement,
+          elements[i].value as CustomFieldQueryElement[]
+        )
       }
     }
   }