1 files changed, 14 insertions, 8 deletions

diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx
index bd6b6d3bd..102bddcf5 100644
--- a/web/react/components/popover_list_members.jsx
+++ b/web/react/components/popover_list_members.jsx
@@ -69,7 +69,6 @@ export default class PopoverListMembers extends React.Component {
 
     render() {
         let popoverHtml = [];
-        let countText = '-';
         const members = this.props.members;
         const teamMembers = UserStore.getProfilesUsernameMap();
         const currentUserId = UserStore.getCurrentId();
@@ -148,13 +147,20 @@ export default class PopoverListMembers extends React.Component {
                     );
                 }
             });
+        }
 
-            const count = this.props.memberCount;
-            if (count > 20) {
-                countText = '20+';
-            } else if (count > 0) {
-                countText = count.toString();
-            }
+        let count = this.props.memberCount;
+        let countText = '-';
+
+        // fall back to checking the length of the member list if the count isn't set
+        if (!count && members) {
+            count = members.length;
+        }
+
+        if (count > 20) {
+            countText = '20+';
+        } else if (count > 0) {
+            countText = count.toString();
         }
 
         return (
@@ -194,6 +200,6 @@ export default class PopoverListMembers extends React.Component {
 
 PopoverListMembers.propTypes = {
     members: React.PropTypes.array.isRequired,
-    memberCount: React.PropTypes.number.isRequired,
+    memberCount: React.PropTypes.number,
     channelId: React.PropTypes.string.isRequired
 };