diff --git a/internal/server/server.go b/internal/server/server.go
index fece6614112cab4a8e201579c820f2640cd36e53..585b2818b2611b95c4d2e2f8c7c6537ff4c9aee1 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -266,6 +266,11 @@ func (r *Room) HandleConn(playerID uuid.UUID, nickname string, c *websocket.Conn
 		r.sendAll()
 	}()
 
+	g.Go(func() error {
+		<-ctx.Done()
+		return c.Close(websocket.StatusGoingAway, "going away")
+	})
+
 	g.Go(func() error {
 		ticker := time.NewTicker(time.Minute)
 		defer ticker.Stop()