diff --git a/server.go b/server.go
index 1294225..892f59b 100644
--- a/server.go
+++ b/server.go
@@ -206,8 +206,8 @@ func (s *Server) joinAndServe(p person) {
 		}
 	}()
 	id, chall, deal := s.l.Queue(ctx, p.id)
-	stop()
 	<-ch
+	stop()
 	if id == (lobby.GameID{}) {
 		// Context canceled.
 		p.conn.Close(websocket.StatusTryAgainLater, "sorry, queue is empty...")