diff --git a/ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts b/ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts
index b77a951984..10c3941ee6 100644
--- a/ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts
@@ -94,18 +94,20 @@ export class FilterDialogComponent extends DialogComponent<FilterDialogComponent
     }
     this.allowKeyFiltersOrConditions = getCurrentAuthState(this.store).allowKeyFiltersOrConditions !== false;
 
-    const initialOperation = !this.allowKeyFiltersOrConditions ? ComplexOperation.AND
-      : (this.filter.keyFiltersOperation ?? ComplexOperation.AND);
     this.filterFormGroup = this.fb.group({
       filter: [this.filter.filter, [this.validateDuplicateFilterName(), Validators.required]],
       editable: [this.filter.editable],
       keyFilters: [this.filter.keyFilters, Validators.required],
-      keyFiltersOperation: [initialOperation]
+      keyFiltersOperation: [this.filter.keyFiltersOperation ?? ComplexOperation.AND]
     });
+    if (!this.allowKeyFiltersOrConditions && this.filter.keyFiltersOperation === ComplexOperation.OR) {
+      this.filterFormGroup.get('keyFiltersOperation').setValue(ComplexOperation.AND);
+      this.filterFormGroup.markAsDirty();
+    }
     if (!this.allowKeyFiltersOrConditions) {
       this.filterFormGroup.get('keyFiltersOperation').valueChanges.subscribe(value => {
         if (value === ComplexOperation.OR) {
-          this.filterFormGroup.get('keyFiltersOperation').setValue(ComplexOperation.AND, {emitEvent: false});
+          this.filterFormGroup.get('keyFiltersOperation').setValue(ComplexOperation.AND);
         }
       });
     }