diff --git a/public/js/Room.js b/public/js/Room.js
index 3bd52b61..836f3928 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -3175,7 +3175,7 @@ function getParticipantsList(peers) {
     for (const peer of Array.from(peers.keys())) {
         const peer_info = peers.get(peer).peer_info;
         const peer_name = peer_info.peer_name;
-        const peer_name_limited = peer_name.substring(0, 10) + '*****';
+        const peer_name_limited = peer_name.length > 15 ? peer_name.substring(0, 10) + '*****' : peer_name;
         //const peer_presenter = peer_info.peer_presenter ? _PEER.presenter : _PEER.guest;
         const peer_audio = peer_info.peer_audio ? _PEER.audioOn : _PEER.audioOff;
         const peer_video = peer_info.peer_video ? _PEER.videoOn : _PEER.videoOff;
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index 408de8c3..0da8f5a8 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -5855,7 +5855,7 @@ class RoomClient {
         const avatarImg = getParticipantAvatar(peer_name);
 
         const generateChatAboutHTML = (imgSrc, title, status = 'online', participants = '') => {
-            const isSensitiveChat = !['all', 'ChatGPT'].includes(peer_id);
+            const isSensitiveChat = !['all', 'ChatGPT'].includes(peer_id) && title.length > 15;
             const truncatedTitle = isSensitiveChat ? `${title.substring(0, 10)}*****` : title;
             return `
                 <img class="all-participants-img"