diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx
index 89fbd0e3ad..30e35b311e 100644
--- a/webapp/components/admin_console/team_users.jsx
+++ b/webapp/components/admin_console/team_users.jsx
@@ -145,7 +145,7 @@ export default class UserList extends React.Component {
     }
 
     componentWillReceiveProps(newProps) {
-        this.getTeamProfiles(newProps.team.id);
+        this.getTeamProfiles(newProps.params.team);
     }
 
     render() {
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index affd4b5a48..a337f23043 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -193,6 +193,9 @@ export default class UserItem extends React.Component {
 
         const teamMember = this.props.teamMember;
         const user = this.props.user;
+        if (!user || !teamMember) {
+            return <div/>;
+        }
         let currentRoles = (
             <FormattedMessage
                 id='admin.user_item.member'