diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index f1cf7f849e..d1d48ef696 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -1039,7 +1039,7 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) StoreCh
             FROM ChannelMembers cm
             INNER JOIN Channels c
                 ON c.Id = cm.ChannelId
-                AND c.TeamId = :TeamId
+                AND (c.TeamId = :TeamId OR c.TeamId = '')
             WHERE cm.UserId = :UserId
 		`, map[string]interface{}{"TeamId": teamId, "UserId": userId})
 
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 2a589b9968..21df429f7b 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -127,6 +127,7 @@ export default class Sidebar extends React.Component {
         document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
 
         loadProfilesAndTeamMembersForDMSidebar();
+        AsyncClient.getMyChannelMembers();
     }
 
     shouldComponentUpdate(nextProps, nextState) {
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 608052a58d..5b6948ea27 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -78,8 +78,6 @@ function preNeedsTeam(nextState, replace, callback) {
                 channels: data
             });
 
-            AsyncClient.getMyChannelMembers();
-
             d1.resolve();
         },
         (err) => {