diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index 844d17605..9e9a334f3 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -147,24 +147,21 @@ RemoteVideo.prototype.removeRemoteStreamElement = function (stream, isVideo, id)
     select.removed = true;
     select.remove();
 
-    var audioCount = $('#' + this.videoSpanId + '>audio').length;
-    var videoCount = $('#' + this.videoSpanId + '>' + APP.RTC.getVideoElementName()).length;
-
-    if (!audioCount && !videoCount) {
-        console.log("Remove whole user", this.videoSpanId);
-        if(this.connectionIndicator)
-            this.connectionIndicator.remove();
-        // Remove whole container
-        if (this.container.parentNode)
-            this.container.parentNode.removeChild(this.container);
-
-        this.VideoLayout.resizeThumbnails();
-    }
-
     if (isVideo)
         this.VideoLayout.updateRemovedVideo(this.getResourceJid());
 };
 
+/**
+ * Removes RemoteVideo from the page.
+ */
+RemoteVideo.prototype.remove = function () {
+    console.log("Remove thumbnail", this.peerJid);
+    this.removeConnectionIndicator();
+    // Remove whole container
+    if (this.container.parentNode)
+        this.container.parentNode.removeChild(this.container);
+};
+
 RemoteVideo.prototype.waitForPlayback = function (sel, stream) {
 
     var isVideo = stream.getVideoTracks().length > 0;
@@ -300,14 +297,14 @@ RemoteVideo.prototype.showPeerContainer = function (state) {
 };
 
 RemoteVideo.prototype.removeConnectionIndicator = function () {
-    if(this.connectionIndicator)
+    if (this.connectionIndicator)
         this.connectionIndicator.remove();
-}
+};
 
 RemoteVideo.prototype.hideConnectionIndicator = function () {
-    if(this.connectionIndicator)
+    if (this.connectionIndicator)
         this.connectionIndicator.hide();
-}
+};
 
 /**
  * Updates the remote video menu.
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 76c46dd0a..e165b99a2 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -821,8 +821,9 @@ var VideoLayout = (function (my) {
 
         var remoteVideo = remoteVideos[resourceJid];
         if (remoteVideo) {
-            remoteVideo.removeConnectionIndicator();
             // Remove remote video
+            console.info("Removing remote video: " + resourceJid);
+            remoteVideo.remove();
             delete remoteVideos[resourceJid];
         } else {
             console.warn("No remote video for " + resourceJid);