diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 7111ed0c6..7f7c6539a 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -30,7 +30,7 @@ var EventEmitter = require("events");
 UI.messageHandler = require("./util/MessageHandler");
 var messageHandler = UI.messageHandler;
 var JitsiPopover = require("./util/JitsiPopover");
-var Feedback = require("./feedback/Feedback");
+import Feedback from "./feedback/Feedback";
 import FollowMe from "../FollowMe";
 
 var eventEmitter = new EventEmitter();
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index 6b70fe5f7..2a5eb0148 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -222,6 +222,8 @@ SmallVideo.prototype.showAudioIndicator = function(isMuted) {
     } else {
         UIUtil.hideElement(mutedIndicator);
     }
+
+    this.isAudioMuted = isMuted;
 };
 
 /**