diff --git a/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts
index 03d110c2f0..ab8f5f241c 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts
@@ -140,8 +140,10 @@ export class EntityKeyAutocompleteComponent implements ControlValueAccessor, Val
       changes.dataKeyType.currentValue !== changes.dataKeyType.previousValue;
 
     if (filterChanged || keyScopeChanged || keyTypeChanged) {
-      this.keyControl.setValue('', {emitEvent: false});
       this.cachedResult = null;
+      if (!this.keyControl.disabled) {
+        this.keyControl.setValue('', {emitEvent: false});
+      }
     }
   }