diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index 189a52085f1c1f95e4f7d3da935fad72cedb893d..c1b082740e4f66c65322ddd5b8073787a35a6c47 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -286,8 +286,7 @@ const isMeetingLocked = (id) => {
     if (lockSettings.disableCam
       || lockSettings.disableMic
       || lockSettings.disablePrivateChat
-      || lockSettings.disablePublicChat
-      || lockSettings.disableNote) {
+      || lockSettings.disablePublicChat) {
       isLocked = true;
     }
   }
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
index 75fb591c5c4398f57523bf39559d521dba88a4d9..340a3947008fc703e8fc7d2a16395fb9e032a96c 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
@@ -57,7 +57,7 @@ class UserNotes extends Component {
   }
 
   renderNotes() {
-    const { intl, disableNotes } = this.props;
+    const { intl, disableNote } = this.props;
     const { unread } = this.state;
 
     let notification = null;
@@ -86,7 +86,7 @@ class UserNotes extends Component {
           <div>
             {intl.formatMessage(intlMessages.sharedNotes)}
           </div>
-          {disableNotes
+          {disableNote
             ? (
               <div className={styles.noteLock}>
                 <Icon iconName="lock" />
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/container.jsx
index bc14addf6dd67e6d3137f679f3fb7351fe951f78..9090376936ff3e58ea762728529e335fd9397e7e 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/container.jsx
@@ -18,10 +18,11 @@ export default withTracker(() => {
       role: 1,
     },
   }).role === ROLE_VIEWER;
+  const shouldDisableNote = (Meeting.lockSettingsProps.disableNote) && isViewer;
 
   return {
     isPanelOpened: NoteService.isPanelOpened(),
     revs: NoteService.getRevs(),
-    disableNotes: Meeting.lockSettingsProps.disableNote && isViewer,
+    disableNote: shouldDisableNote,
   };
 })(UserNotesContainer);