diff --git a/packages/client/src/store/CallState.ts b/packages/client/src/store/CallState.ts
index c9ca516474..4abda5725b 100644
--- a/packages/client/src/store/CallState.ts
+++ b/packages/client/src/store/CallState.ts
@@ -442,7 +442,8 @@ export class CallState {
'call.hls_broadcasting_started': this.updateFromHLSBroadcastStarted,
'call.hls_broadcasting_stopped': this.updateFromHLSBroadcastStopped,
'call.live_started': (e) => this.updateFromCallResponse(e.call),
- 'call.live_ended': (e) => this.updateFromCallResponse(e.call), // Needs to be implemented on backend
+ // TODO: uncomment this when it is added on the backend side
+ // 'call.live_ended': (e) => this.updateFromCallResponse(e.call),
'call.member_added': this.updateFromMemberAdded,
'call.member_removed': this.updateFromMemberRemoved,
'call.member_updated_permission': this.updateMembers,
diff --git a/sample-apps/react/messenger-clone/src/components/ChannelHeader/ChannelHeader.tsx b/sample-apps/react/messenger-clone/src/components/ChannelHeader/ChannelHeader.tsx
index c6085ab2df..7afbca6bae 100644
--- a/sample-apps/react/messenger-clone/src/components/ChannelHeader/ChannelHeader.tsx
+++ b/sample-apps/react/messenger-clone/src/components/ChannelHeader/ChannelHeader.tsx
@@ -44,10 +44,7 @@ const UnMemoizedChannelHeader = (props: ChannelHeaderProps) => {
>
{displayTitle}{' '}
diff --git a/sample-apps/react/messenger-clone/src/components/QuickDial/QuickDial.tsx b/sample-apps/react/messenger-clone/src/components/QuickDial/QuickDial.tsx
index 11c04d7128..47e6527b6e 100644
--- a/sample-apps/react/messenger-clone/src/components/QuickDial/QuickDial.tsx
+++ b/sample-apps/react/messenger-clone/src/components/QuickDial/QuickDial.tsx
@@ -120,11 +120,7 @@ const QuickDialButton =