diff --git a/app/src/Peer.js b/app/src/Peer.js
index 9bedc446..473e6e73 100644
--- a/app/src/Peer.js
+++ b/app/src/Peer.js
@@ -21,6 +21,7 @@ module.exports = class Peer {
     // ####################################################
 
     updatePeerInfo(data) {
+        log.debug('Update peer info', data);
         switch (data.type) {
             case 'audio':
             case 'audioType':
diff --git a/app/src/Server.js b/app/src/Server.js
index a39875e8..e855729d 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -495,7 +495,7 @@ io.on('connection', (socket) => {
     socket.on('peerAction', (data) => {
         if (!roomList.has(socket.room_id)) return;
 
-        log.debug('Peer action:', data);
+        log.debug('Peer action', data);
         if (data.broadcast) {
             roomList.get(socket.room_id).broadCast(data.peer_id, 'peerAction', data);
         } else {
@@ -506,7 +506,6 @@ io.on('connection', (socket) => {
     socket.on('updatePeerInfo', (data) => {
         if (!roomList.has(socket.room_id)) return;
 
-        log.debug('Peer info update:', data);
         // peer_info hand raise Or lower
         roomList.get(socket.room_id).getPeers().get(socket.id).updatePeerInfo(data);
         roomList.get(socket.room_id).broadCast(socket.id, 'updatePeerInfo', data);
@@ -653,6 +652,15 @@ io.on('connection', (socket) => {
 
         let peer_name = getPeerName(false);
 
+        // peer_info audio Or video ON
+        let data = {
+            peer_name: peer_name,
+            peer_id: socket.id,
+            type: kind,
+            status: true,
+        };
+        await roomList.get(socket.room_id).getPeers().get(socket.id).updatePeerInfo(data);
+
         let producer_id = await roomList
             .get(socket.room_id)
             .produce(socket.id, producerTransportId, rtpParameters, kind);
@@ -669,14 +677,6 @@ io.on('connection', (socket) => {
             roomList.get(socket.room_id).addProducerToAudioLevelObserver({ producerId: producer_id });
         }
 
-        // peer_info audio Or video ON
-        let data = {
-            peer_name: peer_name,
-            type: kind,
-            status: true,
-        };
-        roomList.get(socket.room_id).getPeers().get(socket.id).updatePeerInfo(data);
-
         callback({
             producer_id,
         });
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index 22454aa3..60a2f448 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -953,7 +953,8 @@ class RoomClient {
                     this.peerAction('me', this.peer_id + '___sStart', 'screenStart', true, true, false);
                     setAspectRatio(2); // 16:9
                 } else {
-                    this.peerAction('me', this.peer_id + '___sStop', 'screenStop', true, true, false);
+                    if (type === mediaType.screen)
+                        this.peerAction('me', this.peer_id + '___sStop', 'screenStop', true, true, false);
                     handleAspectRatio();
                 }
                 if (!this.isMobileDevice) {