diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
index 16c6e1d7f9..7fadf5763b 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
@@ -104,6 +104,7 @@
         </ng-template>
         <ng-template #recipientsList>
           <tb-entity-list
+            propagateOnSubscribe
             required
             formControlName="targets"
             labelText="{{ 'notification.recipients' | translate }}"
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 566ba78707..e68535b377 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
@@ -45,6 +45,7 @@ import { MatAutocomplete } from '@angular/material/autocomplete';
 import { MatChipGrid } from '@angular/material/chips';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { SubscriptSizing } from '@angular/material/form-field';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-entity-list',
@@ -106,6 +107,10 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
   @Input()
   hint: string;
 
+  @Input()
+  @coerceBoolean()
+  propagateOnSubscribe = false;
+
   @ViewChild('entityInput') entityInput: ElementRef<HTMLInputElement>;
   @ViewChild('entityAutocomplete') matAutocomplete: MatAutocomplete;
   @ViewChild('chipList', {static: true}) chipList: MatChipGrid;
@@ -187,10 +192,11 @@ 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);
+          if (this.propagateOnSubscribe) {
+            this.propagateChange(this.modelValue);
+          }
         }
       );
     } else {