diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index 8ffff14d8a..c62784e7c8 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -268,8 +268,10 @@ RemoteVideo.prototype.showPeerContainer = function (state) {
             resizeThumbnails = true;
             $(this.container).show();
         }
-
-        this.showAvatar(state !== 'show');
+        // Call showAvatar with undefined, so that we'll figure out if avatar
+        // should be displayed based on video muted status and whether or not
+        // it's in the lastN set
+        this.showAvatar(undefined);
     }
     else if ($(this.container).is(':visible') && isHide)
     {