diff --git a/interface_config.js b/interface_config.js
index 2c1987011..8a8b1385b 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -40,5 +40,6 @@ var interfaceConfig = {
     REMOTE_THUMBNAIL_RATIO_WIDTH: 1,
     REMOTE_THUMBNAIL_RATIO_HEIGHT: 1,
     // Enables feedback star animation.
-    ENABLE_FEEDBACK_ANIMATION: false
+    ENABLE_FEEDBACK_ANIMATION: false,
+    DISABLE_FOCUS_INDICATOR: false
 };
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index bf3acfce4..7b7192fae 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -1,5 +1,4 @@
-/* global $, APP, JitsiMeetJS */
-/* jshint -W101 */
+/* global $, APP, JitsiMeetJS, interfaceConfig */
 import Avatar from "../avatar/Avatar";
 import UIUtil from "../util/UIUtil";
 import UIEvents from "../../../service/UI/UIEvents";
@@ -291,6 +290,8 @@ SmallVideo.prototype.getVideoMutedIndicator = function () {
  * Creates the element indicating the moderator(owner) of the conference.
  */
 SmallVideo.prototype.createModeratorIndicatorElement = function () {
+    // don't create moderator indicator if DISABLE_FOCUS_INDICATOR is true
+    if (interfaceConfig.DISABLE_FOCUS_INDICATOR) return false;
     // Show moderator indicator
     var indicatorSpan = $('#' + this.videoSpanId + ' .focusindicator');