diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 89eab9b430..c03c7489ac 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -145,13 +145,10 @@ class SIPSession {
sessionToken,
} = this.user;
- const encodedName =
- btoa && name ? btoa(name) : name;
-
const callerIdName = [
`${userId}_${getAudioSessionNumber()}`,
'bbbID',
- isListenOnly ? `LISTENONLY-${encodedName}` : encodedName,
+ isListenOnly ? `LISTENONLY-${name}` : name,
].join('-').replace(/"/g, "'");
this.user.callerIdName = callerIdName;
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
index c97c2db99a..ec0309527b 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
@@ -1,7 +1,6 @@
import React from 'react';
import { withTracker } from 'meteor/react-meteor-data';
import VoiceUsers from '/imports/api/voice-users';
-import Users from '/imports/api/users'
import Auth from '/imports/ui/services/auth';
import { debounce } from 'lodash';
import TalkingIndicator from './component';
@@ -38,16 +37,12 @@ export default withTracker(() => {
callerName, talking, color, voiceUserId, muted, intId,
} = usersTalking[i];
- const user = Users.findOne({ userId: voiceUserId }, { fields: { name: 1 } });
-
- const _name = user ? user.name : 'USER';
-
talkers[`${intId}`] = {
color,
talking,
voiceUserId,
muted,
- callerName: _name,
+ callerName,
};
}
}