2 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/admin_console/system_analytics.jsx b/web/react/components/admin_console/system_analytics.jsx
index 640f17ff0..fffe7cc53 100644
--- a/web/react/components/admin_console/system_analytics.jsx
+++ b/web/react/components/admin_console/system_analytics.jsx
@@ -142,7 +142,7 @@ export default class SystemAnalytics extends React.Component {
         return (
             <div>
                 <Analytics
-                    title={'the system'}
+                    title={'the System'}
                     channelOpenCount={this.state.channel_open_count}
                     channelPrivateCount={this.state.channel_private_count}
                     postCount={this.state.post_count}
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx
index baa041bac..c164dd98c 100644
--- a/web/react/components/admin_console/team_analytics.jsx
+++ b/web/react/components/admin_console/team_analytics.jsx
@@ -152,6 +152,10 @@ export default class TeamAnalytics extends React.Component {
 
                 var recentActive = [];
                 for (let i = 0; i < usersList.length; i++) {
+                    if (usersList[i].last_activity_at == null) {
+                        continue;
+                    }
+
                     recentActive.push(usersList[i]);
                     if (i > 19) {
                         break;