diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a94cee..3b39c30c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Release date: TBD
 
 #### All Platforms
 - Suppress white screen which is displayed for a moment on startup
+- Support unread indications in team sidebar of Mattermost server 3.6
 
 ### Bug Fixes
 
diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index ab51b3fb..e95b2aab 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -36,6 +36,12 @@ setInterval(function getUnreadCount() {
   // Note: the active channel doesn't have '.unread-title'.
   var unreadCount = document.getElementsByClassName('unread-title').length;
 
+  // unreadCount in team sidebar
+  const teamSideBar = document.getElementsByClassName('team-sidebar'); // team-sidebar doesn't have id
+  if (teamSideBar.length === 1) {
+    unreadCount += teamSideBar[0].getElementsByClassName('unread').length;
+  }
+
   // mentionCount in sidebar
   var elem = document.getElementsByClassName('badge');
   var mentionCount = 0;