diff --git a/packages/client/src/team/TeamEditor.tsx b/packages/client/src/team/TeamEditor.tsx
index d6af798..f7fc7a2 100644
--- a/packages/client/src/team/TeamEditor.tsx
+++ b/packages/client/src/team/TeamEditor.tsx
@@ -34,16 +34,6 @@ extends React.PureComponent<TeamEditorProps, TeamEditorState> {
   getName(team?: Team) {
     return team ? team.name : ''
   }
-  componentWillReceiveProps(nextProps: TeamEditorProps) {
-    if (nextProps.type === 'update') {
-      const {team} = nextProps
-      if (team !== (this.props as UpdateTeamProps).team) {
-        this.setState({
-          name: this.getName(team),
-        })
-      }
-    }
-  }
   handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const name = event.target.value
     this.setState({name})
diff --git a/packages/client/src/team/TeamManager.tsx b/packages/client/src/team/TeamManager.tsx
index 9d7440c..40d945b 100644
--- a/packages/client/src/team/TeamManager.tsx
+++ b/packages/client/src/team/TeamManager.tsx
@@ -69,6 +69,7 @@ export class TeamManager extends React.PureComponent<TeamManagerProps> {
                   <PanelHeading>Edit Team: {team && team.name}</PanelHeading>
                   <PanelBlock isDisplay='block'>
                     {team && <TeamEditor
+                      key={team.id}
                       type='update'
                       team={team}
                       onUpdateTeam={this.props.teamActions.update}
diff --git a/packages/client/src/team/TeamUserList.tsx b/packages/client/src/team/TeamUserList.tsx
index 7fbde5f..79d5301 100644
--- a/packages/client/src/team/TeamUserList.tsx
+++ b/packages/client/src/team/TeamUserList.tsx
@@ -135,9 +135,9 @@ export class TeamUserList extends React.PureComponent<TeamUsersProps> {
   async componentDidMount() {
     await this.fetchUsersInTeam(this.props.team.id)
   }
-  async componentWillReceiveProps(nextProps: TeamUsersProps) {
-    const {team} = nextProps
-    if (team.id !== this.props.team.id) {
+  componentDidUpdate(prevProps: Readonly<TeamUsersProps>) {
+    const {team} = this.props
+    if (team.id !== prevProps.team.id) {
       this.fetchUsersInTeam(team.id)
     }
   }