diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
index a4d7c9bab0..566ba78707 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
@@ -187,8 +187,10 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
       this.modelValue = [...value];
       this.entityService.getEntities(this.entityType, value).subscribe(
         (entities) => {
+          this.modelValue = entities.map(entity => entity.id.id);
           this.entities = entities;
           this.entityListFormGroup.get('entities').setValue(this.entities);
+          this.propagateChange(this.modelValue);
         }
       );
     } else {