1 files changed, 10 insertions, 7 deletions
diff --git a/frontend/src/sagas/home.js b/frontend/src/sagas/home.js
index 99e6f954..151fcb57 100644
--- a/frontend/src/sagas/home.js
+++ b/frontend/src/sagas/home.js
@@ -5,17 +5,20 @@ import { push } from 'react-router-redux'
 import { actions, types } from '../redux/players'
 
 function *sendUsername({ socket }) {
-  const {username} = yield take(types.REQUEST_CHOOSE_USERNAME)
-
-  yield apply(socket, socket.send, ['/app/chooseName', JSON.stringify({ playerName: username  })])
+  while (true) {
+    const {username} = yield take(types.REQUEST_CHOOSE_USERNAME)
+    yield apply(socket, socket.send, ['/app/chooseName', JSON.stringify({playerName: username})])
+  }
 }
 
 function *validateUsername({ socket }) {
   const usernameChannel = yield call(createSubscriptionChannel, socket, '/user/queue/nameChoice')
-  const user = yield take(usernameChannel)
-  yield put(actions.setCurrentPlayer(user))
-  yield apply(usernameChannel, usernameChannel.close)
-  yield put(push('/games'))
+  while (true) {
+    const user = yield take(usernameChannel)
+    yield put(actions.setCurrentPlayer(user))
+    yield apply(usernameChannel, usernameChannel.close)
+    yield put(push('/games'))
+  }
 }
 
 function *usernameChoiceSaga(wsConnection) {