diff --git a/app/sagas/deepLinking.js b/app/sagas/deepLinking.js
index 5d23173f..d5a2b87c 100644
--- a/app/sagas/deepLinking.js
+++ b/app/sagas/deepLinking.js
@@ -75,7 +75,7 @@ const handleOpen = function* handleOpen({ params }) {
 		if (!connected) {
 			yield localAuthenticate(host);
 			yield put(selectServerRequest(host));
-			yield take(types.SERVER.SELECT_SUCCESS);
+			yield take(types.LOGIN.SUCCESS);
 		}
 		yield navigate({ params });
 	} else {
@@ -106,6 +106,8 @@ const handleOpen = function* handleOpen({ params }) {
 		if (params.token) {
 			yield take(types.SERVER.SELECT_SUCCESS);
 			yield RocketChat.connect({ server: host, user: { token: params.token } });
+			yield take(types.LOGIN.SUCCESS);
+			yield navigate({ params });
 		} else {
 			yield handleInviteLink({ params, requireLogin: true });
 		}