diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index 7c90160bb90..7dded9891ae 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -133,7 +133,7 @@ export default class SelectTeam extends React.Component {
             </div>
         );
 
-        if (!this.state.loaded) {
+        if (!this.state.loaded || this.state.loadingTeamId !== '') {
             openContent = <LoadingScreen/>;
         }