diff --git a/modules/UI/recording/Recording.js b/modules/UI/recording/Recording.js
index 386b9d617..38e65504e 100644
--- a/modules/UI/recording/Recording.js
+++ b/modules/UI/recording/Recording.js
@@ -18,10 +18,11 @@ import UIEvents from "../../../service/UI/UIEvents";
 import UIUtil from '../util/UIUtil';
 
 /**
- * Recording.
+ * Indicates if the recording button should be enabled.
+ *
+ * @returns {boolean} {true} if the
+ * @private
  */
-let recordingToaster = null;
-
 function _isRecordingButtonEnabled() {
     return interfaceConfig.TOOLBAR_BUTTONS.indexOf("recording") !== -1
             && config.enableRecording;
@@ -270,6 +271,10 @@ var Recording = {
     },
 
     updateRecordingState(recordingState) {
+        // I'm the recorder, so I don't want to see any UI related to states.
+        if (config.iAmRecorder)
+            return;
+
         // If there's no state change, we ignore the update.
         if (this.currentState === recordingState)
             return;
diff --git a/modules/UI/toolbars/ToolbarToggler.js b/modules/UI/toolbars/ToolbarToggler.js
index 698aef269..ac13c6910 100644
--- a/modules/UI/toolbars/ToolbarToggler.js
+++ b/modules/UI/toolbars/ToolbarToggler.js
@@ -59,7 +59,8 @@ const ToolbarToggler = {
      * Shows the main toolbar.
      */
     showToolbar () {
-        if (interfaceConfig.filmStripOnly) {
+        // if we are a recorder we do not want to show the toolbar
+        if (interfaceConfig.filmStripOnly || config.iAmRecorder) {
             return;
         }
         let header = $("#header");