Merge branch 'master' of https://github.com/mattermost/platform

1 files changed, 6 insertions, 2 deletions

diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx
index 9238c8736..8f9eadab7 100644
--- a/webapp/components/notify_counts.jsx
+++ b/webapp/components/notify_counts.jsx
@@ -9,8 +9,12 @@ function getCountsStateFromStores() {
     var channels = ChannelStore.getAll();
     var members = ChannelStore.getAllMembers();
 
-    channels.forEach(function setChannelInfo(channel) {
+    channels.forEach((channel) => {
         var channelMember = members[channel.id];
+        if (channelMember == null) {
+            return;
+        }
+
         if (channel.type === 'D') {
             count += channel.total_msg_count - channelMember.msg_count;
         } else if (channelMember.mention_count > 0) {
@@ -20,7 +24,7 @@ function getCountsStateFromStores() {
         }
     });
 
-    return {count: count};
+    return {count};
 }
 
 import React from 'react';