diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
index 9fc5109450..893d746afc 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
@@ -235,7 +235,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
           },
           () => {
             this.modelValue = null;
-            this.selectEntityFormGroup.get('entity').patchValue(null, {emitEvent: false});
+            this.selectEntityFormGroup.get('entity').patchValue('', {emitEvent: false});
             if (value !== null) {
               this.propagateChange(this.modelValue);
             }
@@ -250,7 +250,7 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
           },
           () => {
             this.modelValue = null;
-            this.selectEntityFormGroup.get('entity').patchValue(null, {emitEvent: false});
+            this.selectEntityFormGroup.get('entity').patchValue('', {emitEvent: false});
             if (value !== null) {
               this.propagateChange(this.modelValue);
             }