diff --git a/game/session.go b/game/session.go
index 18e81b4..a378e04 100644
--- a/game/session.go
+++ b/game/session.go
@@ -67,6 +67,7 @@ type GameSession struct {
 	actions      map[string]PlayerAction // playerName -> action
 	actionCh     chan playerActionMsg
 	combatSignal chan struct{}
+	done         chan struct{}
 }
 
 type playerActionMsg struct {
@@ -82,6 +83,16 @@ func NewGameSession() *GameSession {
 		actions:      make(map[string]PlayerAction),
 		actionCh:     make(chan playerActionMsg, 4),
 		combatSignal: make(chan struct{}, 1),
+		done:         make(chan struct{}),
+	}
+}
+
+func (s *GameSession) Stop() {
+	select {
+	case <-s.done:
+		// already stopped
+	default:
+		close(s.done)
 	}
 }
 
@@ -102,6 +113,12 @@ func (s *GameSession) StartGame() {
 // combatLoop continuously runs turns while in combat phase
 func (s *GameSession) combatLoop() {
 	for {
+		select {
+		case <-s.done:
+			return
+		default:
+		}
+
 		s.mu.Lock()
 		phase := s.state.Phase
 		gameOver := s.state.GameOver
@@ -112,13 +129,12 @@ func (s *GameSession) combatLoop() {
 		}
 
 		if phase == PhaseCombat {
-			s.RunTurn() // blocks until all actions collected or timeout
+			s.RunTurn()
 		} else {
-			// Not in combat, wait for an action signal to avoid busy-spinning
-			// We'll just sleep briefly and re-check
 			select {
 			case <-s.combatSignal:
-				// Room entered, combat may have started
+			case <-s.done:
+				return
 			}
 		}
 	}
diff --git a/game/turn.go b/game/turn.go
index eb4432a..5d0855d 100644
--- a/game/turn.go
+++ b/game/turn.go
@@ -41,6 +41,9 @@ func (s *GameSession) RunTurn() {
 			collected++
 		case <-timer.C:
 			goto resolve
+		case <-s.done:
+			timer.Stop()
+			return
 		}
 	}
 	timer.Stop()
diff --git a/ui/model.go b/ui/model.go
index c1c4467..47ef114 100644
--- a/ui/model.go
+++ b/ui/model.go
@@ -421,8 +421,16 @@ func (m Model) updateShop(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m Model) updateResult(msg tea.Msg) (tea.Model, tea.Cmd) {
 	if key, ok := msg.(tea.KeyMsg); ok {
 		if isEnter(key) {
-			m.screen = screenLobby
+			if m.session != nil {
+				m.session.Stop()
+				m.session = nil
+			}
+			if m.lobby != nil && m.roomCode != "" {
+				m.lobby.RemoveRoom(m.roomCode)
+			}
+			m.roomCode = ""
 			m.rankingSaved = false
+			m.screen = screenLobby
 			m = m.withRefreshedLobby()
 		} else if isQuit(key) {
 			return m, tea.Quit