diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.html b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.html
index c8c53b987..4fa2f37b8 100644
--- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.html
+++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/layout/layout.component.html
@@ -10,7 +10,7 @@
 				OV_big: track.isPinned,
 				OV_ignored: track.isAudioTrack && !track.participant.onlyHasAudioTracks
 			}"
-			[id]="'local-element-' + track.source"
+			[id]="'participant-' + track.participant.identity"
 			cdkDrag
 			cdkDragBoundary=".layout"
 			[cdkDragDisabled]="!track.isMinimized"
@@ -27,6 +27,7 @@
 		<div
 			*ngFor="let track of remoteParticipants | tracks; trackBy: trackParticipantElement"
 			class="remote-participant"
+			[id]="'participant-' + track.participant.identity"
 			[ngClass]="{
 				OV_root: !track.isAudioTrack,
 				OV_publisher: !track.isAudioTrack,
diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/internals.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/internals.directive.ts
index 69b8fede2..3c50cc346 100644
--- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/internals.directive.ts
+++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/api/internals.directive.ts
@@ -58,7 +58,10 @@ export class FallbackLogoDirective implements OnInit {
 	standalone: false
 })
 export class LayoutRemoteParticipantsDirective {
+	private _ovRemoteParticipants: ParticipantModel[] | undefined;
+
 	@Input() set ovRemoteParticipants(value: ParticipantModel[] | undefined) {
+		this._ovRemoteParticipants = value;
 		this.update(value);
 	}
 	constructor(
@@ -71,7 +74,7 @@ export class LayoutRemoteParticipantsDirective {
 	}
 
 	ngAfterViewInit() {
-		this.update(this.ovRemoteParticipants);
+		this.update(this._ovRemoteParticipants);
 	}
 
 	update(value: ParticipantModel[] | undefined) {