diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
index a0c1904cc8..dcc54c94b3 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
@@ -223,7 +223,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
     }
     if (!onInit) {
       this.argumentFormGroup.get('refEntityKey').get('key').setValue('');
-    } else {
+    } else if (this.predefinedEntityFilter) {
       entityFilter = this.predefinedEntityFilter;
     }
     this.entityFilter = entityFilter;