1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 55df5105f..c7010dcd4 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -199,6 +199,11 @@ function handlePostDeleteEvent(msg) {
 }
 
 function handleNewUserEvent(msg) {
+    if (TeamStore.getCurrentId() === '') {
+        // Any new users will be loaded when we switch into a context with a team
+        return;
+    }
+
     AsyncClient.getUser(msg.data.user_id);
     AsyncClient.getChannelStats();
     loadProfilesAndTeamMembersForDMSidebar();