diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index fd898c4b5..10aefd39c 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -345,14 +345,14 @@ var VideoLayout = (function (my) {
 
         Object.keys(members).forEach(function (jid) {
 
-            if (Strophe.getResourceFromJid(jid) === 'focus') {
+            var resourceJid = Strophe.getResourceFromJid(jid);
+            var member = members[jid];
+
+            if (member.isFocus) {
                 // Skip server side focus
                 return;
             }
 
-            var resourceJid = Strophe.getResourceFromJid(jid);
-            var member = members[jid];
-
             if (member.role === 'moderator') {
                 remoteVideos[resourceJid].removeRemoteVideoMenu();
                 remoteVideos[resourceJid].createModeratorIndicatorElement();
@@ -1013,4 +1013,4 @@ var VideoLayout = (function (my) {
     return my;
 }(VideoLayout || {}));
 
-module.exports = VideoLayout;
\ No newline at end of file
+module.exports = VideoLayout;