diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js
index 703d73e07..fe512895e 100644
--- a/modules/UI/videolayout/LargeVideo.js
+++ b/modules/UI/videolayout/LargeVideo.js
@@ -165,7 +165,6 @@ class VideoContainer extends LargeContainer {
 
     get id () {
         return getStreamOwnerId(this.stream);
-        return getStreamId(this.stream);
     }
 
     constructor (onPlay) {
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index f3cb7540e..4496c07b3 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -633,7 +633,7 @@ var VideoLayout = {
         var updateLargeVideo = false;
 
         // Handle LastN/local LastN changes.
-        BottomToolbar.getThumbs().each(function( index, element ) {
+        BottomToolbar.getThumbs().each(( index, element ) => {
             var resourceJid = getPeerContainerResourceId(element);
 
             // We do not want to process any logic for our own(local) video