1 files changed, 4 insertions, 1 deletions
diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx
index e6380d19e..0193d181b 100644
--- a/web/react/stores/team_store.jsx
+++ b/web/react/stores/team_store.jsx
@@ -64,7 +64,10 @@ var TeamStore = assign({}, EventEmitter.prototype, {
       return null;
   },
   getCurrentTeamUrl: function() {
-      return getWindowLocationOrigin() + "/" + this.getCurrent().name;
+      if(this.getCurrent()) {
+          return getWindowLocationOrigin() + "/" + this.getCurrent().name;
+      }
+      return null;
   },
   storeTeam: function(team) {
       var teams = this._getTeams();