diff --git a/modules/UI/Feedback.js b/modules/UI/Feedback.js
index 92f79bc37..5fca4464e 100644
--- a/modules/UI/Feedback.js
+++ b/modules/UI/Feedback.js
@@ -100,15 +100,18 @@ var Feedback = {
      * @param emitter the EventEmitter to associate with the Feedback.
      */
     init: function (emitter) {
-        // Initialise to enabled.
-        this.enabled = true;
-
         // CallStats is the way we send feedback, so we don't have to initialise
         // if callstats isn't enabled.
         if (!APP.conference.isCallstatsEnabled())
             return;
 
-        _showFeedbackButton(true);
+        // If enabled property is still undefined, i.e. it hasn't been set from
+        // some other module already, we set it to true by default.
+        if (typeof this.enabled == "undefined")
+            this.enabled = true;
+
+        _showFeedbackButton(this.enabled);
+
         $("#feedbackButton").click(function (event) {
             Feedback.openFeedbackWindow();
         });
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index a05000ced..260b003b9 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -31,7 +31,6 @@ var Feedback = require("./Feedback");
 import FollowMe from "../FollowMe";
 import Recorder from "../recorder/Recorder";
 
-
 var eventEmitter = new EventEmitter();
 UI.eventEmitter = eventEmitter;
 
@@ -245,7 +244,7 @@ UI.initConference = function () {
     // Initialise the recorder handler. We're doing this explicitly before
     // calling showToolbar, because the recorder may want to disable all
     // toolbars.
-    new Recorder(APP.conference, UI);
+    new Recorder(APP.conference);
 
     // Once we've joined the muc show the toolbar
     ToolbarToggler.showToolbar();
@@ -260,6 +259,7 @@ UI.initConference = function () {
     UI.setUserAvatar(id, Settings.getEmail());
 
     Toolbar.checkAutoEnableDesktopSharing();
+
     if(!interfaceConfig.filmStripOnly) {
         Feedback.init(eventEmitter);
     }
diff --git a/modules/recorder/Recorder.js b/modules/recorder/Recorder.js
index 9f2f7d870..ca156f264 100644
--- a/modules/recorder/Recorder.js
+++ b/modules/recorder/Recorder.js
@@ -27,14 +27,9 @@ class Recorder {
      *
      * @param conference the {conference} which is to transport
      * {Recorder}-related information between participants
-     * @param UI the {UI} which is the source (model/state) to be sent to
-     * remote participants if the local participant is the moderator or the
-     * destination (model/state) to receive from the remote moderator if the
-     * local participant is not the moderator
      */
-    constructor (conference, UI) {
+    constructor (conference) {
         this._conference = conference;
-        this._UI = UI;
 
         // If I am a recorder then I publish my recorder custom role to notify
         // everyone.