diff --git a/openvidu-components/openvidu-custom-layout/src/app/app.component.ts b/openvidu-components/openvidu-custom-layout/src/app/app.component.ts
index 574fe6aa..6b7d0281 100644
--- a/openvidu-components/openvidu-custom-layout/src/app/app.component.ts
+++ b/openvidu-components/openvidu-custom-layout/src/app/app.component.ts
@@ -7,7 +7,7 @@ import { TokenModel, ParticipantService, ParticipantAbstractModel } from "openvi
 @Component({
 	selector: "app-root",
 	template: `
-		<ov-videoconference	[tokens]="tokens">
+		<ov-videoconference	[tokens]="tokens" (onSessionCreated)="subscribeToParticipants()">
 			<div *ovLayout>
 				<div class="container">
 					<div class="item" *ngFor="let stream of localParticipant | streams">
@@ -48,7 +48,6 @@ export class AppComponent implements OnInit {
 	constructor(private httpClient: HttpClient, private participantService: ParticipantService) { }
 
 	async ngOnInit() {
-		this.subscribeToParticipants();
 		this.tokens = {
 			webcam: await this.getToken(),
 			screen: await this.getToken()
@@ -75,12 +74,12 @@ export class AppComponent implements OnInit {
 	 * --------------------------------------------
 	 * The methods below request the creation of a Session and a Token to
 	 * your application server. This keeps your OpenVidu deployment secure.
-	 * 
+	 *
 	 * In this sample code, there is no user control at all. Anybody could
 	 * access your application server endpoints! In a real production
 	 * environment, your application server must identify the user to allow
 	 * access to the endpoints.
-	 * 
+	 *
 	 * Visit https://docs.openvidu.io/en/stable/application-server to learn
 	 * more about the integration of OpenVidu in your application server.
 	 */
diff --git a/openvidu-components/openvidu-custom-participants-panel/src/app/app.component.ts b/openvidu-components/openvidu-custom-participants-panel/src/app/app.component.ts
index 7ce9e940..048e1253 100644
--- a/openvidu-components/openvidu-custom-participants-panel/src/app/app.component.ts
+++ b/openvidu-components/openvidu-custom-participants-panel/src/app/app.component.ts
@@ -7,7 +7,7 @@ import { ParticipantAbstractModel, ParticipantService, TokenModel } from "openvi
 @Component({
 	selector: 'app-root',
 	template: `
-		<ov-videoconference [tokens]="tokens" [toolbarDisplaySessionName]="false">
+		<ov-videoconference [tokens]="tokens" [toolbarDisplaySessionName]="false" (onSessionCreated)="subscribeToParticipants()">
 			<div *ovParticipantsPanel id="my-panel">
 				<ul id="local">
 					<li>{{localParticipant.nickname}}</li>
@@ -50,7 +50,6 @@ export class AppComponent implements OnInit {
 	) { }
 
 	async ngOnInit() {
-		this.subscribeToParticipants();
 		this.tokens = {
 			webcam: await this.getToken(),
 			screen: await this.getToken()
@@ -78,12 +77,12 @@ export class AppComponent implements OnInit {
 	 * --------------------------------------------
 	 * The methods below request the creation of a Session and a Token to
 	 * your application server. This keeps your OpenVidu deployment secure.
-	 * 
+	 *
 	 * In this sample code, there is no user control at all. Anybody could
 	 * access your application server endpoints! In a real production
 	 * environment, your application server must identify the user to allow
 	 * access to the endpoints.
-	 * 
+	 *
 	 * Visit https://docs.openvidu.io/en/stable/application-server to learn
 	 * more about the integration of OpenVidu in your application server.
 	 */