1 files changed, 10 insertions, 0 deletions
diff --git a/webapp/components/analytics/team_analytics/index.js b/webapp/components/analytics/team_analytics/index.js
index 270967a1b..0620a8fdb 100644
--- a/webapp/components/analytics/team_analytics/index.js
+++ b/webapp/components/analytics/team_analytics/index.js
@@ -5,10 +5,20 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {getTeams} from 'mattermost-redux/actions/teams';
 
+import {getTeamsList} from 'mattermost-redux/selectors/entities/teams';
+import BrowserStore from 'stores/browser_store.jsx';
+
 import TeamAnalytics from './team_analytics.jsx';
 
+const LAST_ANALYTICS_TEAM = 'last_analytics_team';
+
 function mapStateToProps(state, ownProps) {
+    const teams = getTeamsList(state);
+    const teamId = BrowserStore.getGlobalItem(LAST_ANALYTICS_TEAM, teams.length > 0 ? teams[0].id : '');
+
     return {
+        initialTeam: state.entities.teams.teams[teamId],
+        teams,
         ...ownProps
     };
 }