diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js
index 479687ed0..ce4c9f3ea 100644
--- a/modules/UI/videolayout/LargeVideo.js
+++ b/modules/UI/videolayout/LargeVideo.js
@@ -307,9 +307,9 @@ class VideoContainer extends LargeContainer {
     show () {
         let $wrapper = this.$wrapper;
         return new Promise(function(resolve) {
-            $wrapper.css({visibility: 'visible'});
+            $wrapper.css('visibility', 'visible');
             $wrapper.fadeTo(FADE_DURATION_MS, 1, function () {
-                $('.watermark').css({visibility: 'visible'});
+                $('.watermark').css('visibility', 'visible');
                 resolve();
             });
         });
@@ -317,12 +317,15 @@ class VideoContainer extends LargeContainer {
 
     hide () {
         let $wrapper = this.$wrapper;
-
         let id = this.id;
         return new Promise(function(resolve) {
+            // There is no id on initial render
+            // so first time we hide wrapper immediately
+            // instead of slowly fading it out.
+            // This improves startup time.
             $wrapper.fadeTo(id ? FADE_DURATION_MS : 1, 0, function () {
-                $wrapper.css({visibility: 'hidden'});
-                $('.watermark').css({visibility: 'hidden'});
+                $wrapper.css('visibility', 'hidden');
+                $('.watermark').css('visibility', 'hidden');
                 resolve();
             });
         });
@@ -514,14 +517,6 @@ export default class LargeVideoManager {
         $("#dominantSpeakerAvatar").attr('src', avatarUrl);
     }
 
-    /**
-     * Show avatar on Large video container or not.
-     * @param {boolean} show
-     */
-    showAvatar (show) {
-        this.videoContainer.showAvatar(show);
-    }
-
     /**
      * Add container of specified type.
      * @param {string} type container type
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 07b3858b1..5a0a81843 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -1,4 +1,4 @@
-/* global config, APP, $, interfaceConfig */
+/* global config, APP, $, interfaceConfig, JitsiMeetJS */
 /* jshint -W101 */
 
 import AudioLevels from "../audio_levels/AudioLevels";
@@ -504,8 +504,10 @@ var VideoLayout = {
             remoteVideo.setMutedView(value);
         }
 
-        if(this.isCurrentlyOnLarge(id))
-            largeVideo.showAvatar(value);
+        if (this.isCurrentlyOnLarge(id)) {
+            // large video will show avatar instead of muted stream
+            this.updateLargeVideo(id, true);
+        }
     },
 
     /**