diff --git a/app/screens/select_team/index.js b/app/screens/select_team/index.js
index 8978cd48d..011743c81 100644
--- a/app/screens/select_team/index.js
+++ b/app/screens/select_team/index.js
@@ -31,7 +31,6 @@ function mapStateToProps(state) {
         teamsRequest: state.requests.teams.getTeams,
         teams: Object.values(getJoinableTeams(state)).sort(sortTeams),
         currentChannelId: getCurrentChannelId(state),
-        joinTeamRequest: state.requests.teams.joinTeam,
     };
 }
 
diff --git a/app/screens/select_team/select_team.js b/app/screens/select_team/select_team.js
index 8865ffc75..55785a390 100644
--- a/app/screens/select_team/select_team.js
+++ b/app/screens/select_team/select_team.js
@@ -51,7 +51,6 @@ export default class SelectTeam extends PureComponent {
         }).isRequired,
         currentChannelId: PropTypes.string,
         currentUrl: PropTypes.string.isRequired,
-        joinTeamRequest: PropTypes.object.isRequired,
         navigator: PropTypes.object,
         userWithoutTeams: PropTypes.bool,
         teams: PropTypes.array.isRequired,
@@ -81,11 +80,6 @@ export default class SelectTeam extends PureComponent {
         if (this.props.teams !== nextProps.teams) {
             this.buildData(nextProps);
         }
-
-        if (this.props.joinTeamRequest.status !== RequestStatus.FAILURE &&
-            nextProps.joinTeamRequest.status === RequestStatus.FAILURE) {
-            Alert.alert('', nextProps.joinTeamRequest.error.message);
-        }
     }
 
     getTeams = () => {
@@ -160,8 +154,9 @@ export default class SelectTeam extends PureComponent {
             markChannelAsRead(currentChannelId);
         }
 
-        const success = await joinTeam(team.invite_id, team.id);
-        if (!success) {
+        const {error} = await joinTeam(team.invite_id, team.id);
+        if (error) {
+            Alert.alert(error.message);
             this.setState({joining: false});
             return;
         }
diff --git a/app/screens/select_team/select_team.test.js b/app/screens/select_team/select_team.test.js
index b573dfeab..64311f8a9 100644
--- a/app/screens/select_team/select_team.test.js
+++ b/app/screens/select_team/select_team.test.js
@@ -36,7 +36,6 @@ describe('SelectTeam', () => {
         actions,
         currentChannelId: 'someId',
         currentUrl: 'test',
-        joinTeamRequest: {},
         navigator: {
             setOnNavigatorEvent: jest.fn(),
         },