diff --git a/bigbluebutton-html5/imports/ui/components/lock-viewers/notify/component.jsx b/bigbluebutton-html5/imports/ui/components/lock-viewers/notify/component.jsx
index fa3ee7104ab975271534c91756cfbbcffbc1d6e2..82ade9223c22976fa0f442b41b262c7d2975ed40 100644
--- a/bigbluebutton-html5/imports/ui/components/lock-viewers/notify/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/lock-viewers/notify/component.jsx
@@ -27,8 +27,6 @@ const intlMessages = defineMessages({
 });
 
 class LockViewersNotifyComponent extends Component {
-  componentDidMount() {}
-
   componentDidUpdate(prevProps) {
     const {
       lockSettings,
@@ -42,10 +40,11 @@ class LockViewersNotifyComponent extends Component {
     } = prevProps;
 
     if (!_.isEqual(lockSettings, prevLockSettings)) {
+      const rejectedKeys = ['setBy', 'lockedLayout'];
       const filteredSettings = Object.keys(lockSettings)
         .filter(key => prevLockSettings[key] !== lockSettings[key]
           && lockSettings[key]
-          && key !== 'setBy');
+          && !rejectedKeys.includes(key));
       filteredSettings.forEach((key) => {
         notify(intl.formatMessage(intlMessages[key]), 'info', 'lock');
       });