diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
index 4be4fe21ea1bf4ec238f8687ef7fb15d88f03f81..4329955b5c25c1435c02a7b23f8c612fde6987e1 100755
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
@@ -72,11 +72,6 @@ export default function addUser(meetingId, user) {
   const dummyUser = Users.findOne(selector);
   let userRole = user.role;
 
-  // prevents users status being lost on page reload
-  if (dummyUser.clientType === 'HTML5') {
-    user.emoji = dummyUser.emoji ? dummyUser.emoji : 'none';
-  }
-
   if (
     dummyUser &&
     dummyUser.clientType === 'HTML5' &&
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
index eeeb1477b9afc79b79e15f0c553d7f384ed5a560..228a32aec7cc493bff608e50b58adf3bddf2fdb2 100644
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
@@ -23,6 +23,7 @@ export default function removeUser(meetingId, userId) {
     $set: {
       connectionStatus: 'offline',
       validated: false,
+      emoji: 'none',
       presenter: false,
       role: 'VIEWER',
     },