diff --git a/frontend/src/pages/pong/pong.ts b/frontend/src/pages/pong/pong.ts
index c83410a..4f129ad 100644
--- a/frontend/src/pages/pong/pong.ts
+++ b/frontend/src/pages/pong/pong.ts
@@ -367,6 +367,7 @@ function pongClient(
 			});
 
 			socket.on("tourEnding", (ending) => {
+				inTournament = false;
 				showInfo(ending);
 			});
 			// ---
@@ -557,12 +558,12 @@ function pongClient(
 						tournamentBtn.innerText = TourBtnState.AbleToCreate;
 						break;
 					case "playing":
-						inTournament = true;
+						inTournament = weIn;
 						tournamentBtn.innerText = TourBtnState.Started;
 						tour_infos.innerText = `${TourInfoState.Running} ${s.players.length}👤 ${s.remainingMatches ?? "?"}▮•▮`;
 						break;
 					case "prestart":
-						inTournament = true;
+						inTournament = weIn;
 						tour_infos.innerText = `${imOwner ? TourInfoState.Owner : weIn ? TourInfoState.Registered : TourInfoState.NotRegisted} ${s.players.length}👤 ?▮•▮`;
 						if (imOwner) {
 							tournamentBtn.innerText = TourBtnState.AbleToStart;
diff --git a/src/pong/src/state.ts b/src/pong/src/state.ts
index 75c0a02..71420bf 100644
--- a/src/pong/src/state.ts
+++ b/src/pong/src/state.ts
@@ -157,6 +157,7 @@ class StateI {
 			return;
 		}
 
+		this.queue.delete(user.id);
 		this.tournament.addUser(user.id, name ?? udb.name);
 		sock.emit('tournamentRegister', {
 			kind: 'success',