diff --git a/src/helpers/livekit/HandleParticipants.ts b/src/helpers/livekit/HandleParticipants.ts
index 75699be5..895ea5df 100644
--- a/src/helpers/livekit/HandleParticipants.ts
+++ b/src/helpers/livekit/HandleParticipants.ts
@@ -69,24 +69,8 @@ export default class HandleParticipants {
   ) => {
     let metadata;
     if (participant.metadata) {
-      const m: ICurrentUserMetadata = JSON.parse(participant.metadata);
-      if (
-        m.wait_for_approval &&
-        store.getState().session.currentUser?.metadata?.is_admin
-      ) {
-        toast(
-          i18n
-            .t('waiting-room.user-waiting', {
-              name: participant.name,
-            })
-            .toString(),
-          {
-            type: 'info',
-            toastId: 'user-waiting',
-          },
-        );
-      }
-      metadata = m;
+      metadata = JSON.parse(participant.metadata);
+      this.notificationForWaitingUser(metadata, participant.name);
     }
 
     store.dispatch(
@@ -177,6 +161,8 @@ export default class HandleParticipants {
   ) => {
     if (participant.metadata) {
       const metadata: ICurrentUserMetadata = JSON.parse(participant.metadata);
+      this.notificationForWaitingUser(metadata, participant.name);
+
       store.dispatch(
         updateParticipant({
           id: participant.identity,
@@ -192,4 +178,23 @@ export default class HandleParticipants {
       }
     }
   };
+
+  private notificationForWaitingUser(metadata: ICurrentUserMetadata, name) {
+    if (
+      metadata.wait_for_approval &&
+      store.getState().session.currentUser?.metadata?.is_admin
+    ) {
+      toast(
+        i18n
+          .t('waiting-room.user-waiting', {
+            name: name,
+          })
+          .toString(),
+        {
+          type: 'info',
+          toastId: 'user-waiting',
+        },
+      );
+    }
+  }
 }
diff --git a/src/helpers/websocket/handleSystemType.tsx b/src/helpers/websocket/handleSystemType.tsx
index b4e06dc2..5af31ab2 100644
--- a/src/helpers/websocket/handleSystemType.tsx
+++ b/src/helpers/websocket/handleSystemType.tsx
@@ -144,6 +144,10 @@ const handleExternalMediaPlayerEvents = (data: DataMessage) => {
 };
 
 const handlePollsNotifications = (data: DataMessage) => {
+  // for recorder don't need to show anything
+  if (store.getState().session.currentUser?.isRecorder) {
+    return;
+  }
   if (data.body?.type === DataMsgBodyType.POLL_CREATED) {
     toast(<NewPollMsg />, {
       toastId: 'info-status',