1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index cd00c65dd..4c11bb985 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -79,8 +79,13 @@ export default class Sidebar extends React.Component {
         const unreadCounts = this.state.unreadCounts;
 
         Object.keys(unreadCounts).forEach((chId) => {
-            msgs += unreadCounts[chId].msgs;
-            mentions += unreadCounts[chId].mentions;
+            const channel = ChannelStore.get(chId);
+            if (channel) {
+                if (channel.team_id === this.state.currentTeam.id) {
+                    msgs += unreadCounts[chId].msgs;
+                    mentions += unreadCounts[chId].mentions;
+                }
+            }
         });
 
         return {msgs, mentions};