diff --git a/server.go b/server.go
index dd8393d..290f661 100644
--- a/server.go
+++ b/server.go
@@ -197,7 +197,7 @@ func (s *Server) Queue(w http.ResponseWriter, r *http.Request) {
 
 func (s *Server) joinAndServe(p person) {
 	slog.Debug("joining", "player", p.id)
-	ctx, stop := context.WithTimeoutCause(context.Background(), 10*time.Minute, errQueueEmpty)
+	ctx, stop := context.WithTimeoutCause(context.Background(), 3*time.Minute, errQueueEmpty)
 	ch := make(chan struct{})
 	go func() {
 		defer close(ch)