diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index ff9ff408ce8f73d7158547447ffdc2380a3e2e2a..b90ed8e86fa966bdd9152d26415db44481c15f63 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -75,8 +75,6 @@ const defaultProps = {
   shortcuts: '',
 };
 
-const interval = null;
-
 const openBreakoutJoinConfirmation = (breakout, breakoutName, mountModal) => mountModal(
   <BreakoutJoinConfirmation
     breakout={breakout}
@@ -101,8 +99,8 @@ class NavBar extends PureComponent {
   }
 
   componentDidMount() {
-    if (Meteor.settings.public.allowOutsideCommands.toggleRecording ||
-      getFromUserSettings('outsideToggleRecording', false)) {
+    if (Meteor.settings.public.allowOutsideCommands.toggleRecording
+      || getFromUserSettings('outsideToggleRecording', false)) {
       ActionBarService.connectRecordingObserver();
       window.addEventListener('message', ActionBarService.processOutsideToggleRecording);
     }
@@ -154,7 +152,7 @@ class NavBar extends PureComponent {
   }
 
   componentWillUnmount() {
-    clearInterval(interval);
+    clearInterval(this.interval);
   }
 
   handleToggleUserList() {
@@ -293,10 +291,10 @@ class NavBar extends PureComponent {
           <RecordingIndicator
             {...recordProps}
             title={intl.formatMessage(intlMessages[recordingMessage])}
-            buttonTitle={(!recordProps.recording ? intl.formatMessage(intlMessages.startTitle) :
-               intl.formatMessage(intlMessages.stopTitle))}
+            buttonTitle={(!recordProps.recording ? intl.formatMessage(intlMessages.startTitle)
+              : intl.formatMessage(intlMessages.stopTitle))}
             mountModal={mountModal}
-            time= {time}
+            time={time}
           />
         </div>
         <div className={styles.right}>
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
index b005473115f68bb63f4bff80315a06b6266af6cb..7da7efadae388bb273c704ebf63057ddc597d574 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
 import RecordingContainer from '/imports/ui/components/recording/container';
 import humanizeSeconds from '/imports/utils/humanizeSeconds';
-import { styles } from './styles';
 import cx from 'classnames';
+import { styles } from './styles';
 
 const RecordingIndicator = ({
   record, title, recording, buttonTitle, mountModal, time,
@@ -24,6 +23,7 @@ const RecordingIndicator = ({
           className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
           onClick={() => {
             mountModal(<RecordingContainer />);
+            document.activeElement.blur();
           }}
         />
       </div>
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index e3ba3056e59a6eaeb454bdb8eda076fecaa6130b..69808d4d0b9cefe7f24b6efaec12e4bdb8f08a43 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -100,7 +100,7 @@ public:
     enableListenOnly: false
     autoShareWebcam: false
   allowOutsideCommands:
-    toggleRecording: true
+    toggleRecording: false
     toggleSelfVoice: false
   poll:
     max_custom: 5