diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index 0fa98fe43..41c3e6a21 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -366,14 +366,7 @@ RemoteVideo.prototype.removeRemoteStreamElement = function(stream) {
     logger.info(`${isVideo ? 'Video' : 'Audio'
     } removed ${this.id}`, select);
 
-    // when removing only the video element and we are on stage
-    // update the stage
-    if (isVideo && this.isCurrentlyOnLargeVideo()) {
-        this.VideoLayout.updateLargeVideo(this.id);
-    } else {
-        // Missing video stream will affect display mode
-        this.updateView();
-    }
+    this.updateView();
 };
 
 /**
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 4f207ba49..c8e33c503 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -347,6 +347,11 @@ const VideoLayout = {
         if (remoteVideo) {
             remoteVideo.removeRemoteStreamElement(stream);
         }
+
+        if (stream.isVideoTrack() && this.isCurrentlyOnLarge(id)) {
+            this.updateLargeVideo(id);
+        }
+
         this.updateMutedForNoTracks(id, stream.getType());
     },