diff --git a/frontend/projects/shared-meet-components/src/lib/services/webcomponent-manager/webcomponent-manager.service.ts b/frontend/projects/shared-meet-components/src/lib/services/webcomponent-manager/webcomponent-manager.service.ts
index c7eb46c..5e7322c 100644
--- a/frontend/projects/shared-meet-components/src/lib/services/webcomponent-manager/webcomponent-manager.service.ts
+++ b/frontend/projects/shared-meet-components/src/lib/services/webcomponent-manager/webcomponent-manager.service.ts
@@ -21,6 +21,7 @@ import { OutboundEventMessage, InboundCommandMessage } from 'webcomponent/src/mo
 })
 export class WebComponentManagerService {
 	protected isListenerStarted = false;
+	protected boundHandleMessage: (event: MessageEvent) => Promise<void>;
 	protected log;
 
 	constructor(
@@ -31,6 +32,7 @@ export class WebComponentManagerService {
 		protected httpService: HttpService
 	) {
 		this.log = this.loggerService.get('OpenVidu Meet - WebComponentManagerService');
+		this.boundHandleMessage = this.handleMessage.bind(this);
 	}
 
 	startCommandsListener(): void {
@@ -38,56 +40,15 @@ export class WebComponentManagerService {
 
 		this.isListenerStarted = true;
 		// Listen for messages from the iframe
-		window.addEventListener('message', async (event) => {
-			const message: InboundCommandMessage = event.data;
-			const parentDomain = this.contextService.getParentDomain();
-			const { command, payload } = message;
-
-			if (!parentDomain) {
-				if (command === WebComponentCommand.INITIALIZE) {
-					if (!payload || !('domain' in payload)) {
-						console.error('Parent domain not provided in message payload');
-						return;
-					}
-					this.log.d(`Parent domain set: ${event.origin}`);
-					this.contextService.setParentDomain(payload['domain']);
-				}
-				return;
-			}
-
-			if (event.origin !== parentDomain) {
-				// console.warn(`Untrusted origin: ${event.origin}`);
-				return;
-			}
-
-			console.debug('Message received from parent:', event.data);
-			// TODO: reject if room is not connected
-			switch (command) {
-				case WebComponentCommand.END_MEETING:
-					// Moderator only
-					if (this.contextService.isModeratorParticipant()) {
-						const roomId = this.contextService.getRoomId();
-						await this.httpService.endMeeting(roomId);
-					}
-					break;
-				// case WebComponentCommand.TOGGLE_CHAT:
-				// Toggle chat
-				// this.panelService.togglePanel(PanelType.CHAT);
-				// break;
-				case WebComponentCommand.LEAVE_ROOM:
-					// Leave room.
-					await this.openviduService.disconnectRoom();
-					break;
-				default:
-					break;
-			}
-		});
+		window.addEventListener('message', this.boundHandleMessage);
+		this.log.d('Started commands listener');
 	}
 
 	stopCommandsListener(): void {
 		if (!this.isListenerStarted) return;
 		this.isListenerStarted = false;
-		window.removeEventListener('message', this.startCommandsListener);
+		window.removeEventListener('message', this.boundHandleMessage);
+		this.log.d('Stopped commands listener');
 	}
 
 	sendMessageToParent(event: OutboundEventMessage) {
@@ -96,4 +57,49 @@ export class WebComponentManagerService {
 		const origin = this.contextService.getParentDomain();
 		window.parent.postMessage(event, origin);
 	}
+
+	protected async handleMessage(event: MessageEvent): Promise<void> {
+		const message: InboundCommandMessage = event.data;
+		const parentDomain = this.contextService.getParentDomain();
+		const { command, payload } = message;
+
+		if (!parentDomain) {
+			if (command === WebComponentCommand.INITIALIZE) {
+				if (!payload || !('domain' in payload)) {
+					console.error('Parent domain not provided in message payload');
+					return;
+				}
+				this.log.d(`Parent domain set: ${event.origin}`);
+				this.contextService.setParentDomain(payload['domain']);
+			}
+			return;
+		}
+
+		if (event.origin !== parentDomain) {
+			// console.warn(`Untrusted origin: ${event.origin}`);
+			return;
+		}
+
+		console.debug('Message received from parent:', event.data);
+		// TODO: reject if room is not connected
+		switch (command) {
+			case WebComponentCommand.END_MEETING:
+				// Moderator only
+				if (this.contextService.isModeratorParticipant()) {
+					const roomId = this.contextService.getRoomId();
+					await this.httpService.endMeeting(roomId);
+				}
+				break;
+			// case WebComponentCommand.TOGGLE_CHAT:
+			// Toggle chat
+			// this.panelService.togglePanel(PanelType.CHAT);
+			// break;
+			case WebComponentCommand.LEAVE_ROOM:
+				// Leave room.
+				await this.openviduService.disconnectRoom();
+				break;
+			default:
+				break;
+		}
+	}
 }