From 29b5ec25556f622187f5dc35db79ca1f145f1a04 Mon Sep 17 00:00:00 2001
From: Mikita Lisavets <mikita.lisavets@gmail.com>
Date: Mon, 6 Apr 2026 16:52:27 +0200
Subject: [PATCH] fix: clear session-scoped model after session reset

---
 gateway/run.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gateway/run.py b/gateway/run.py
index 4838ce212..731bc8c03 100644
--- a/gateway/run.py
+++ b/gateway/run.py
@@ -3264,13 +3264,13 @@ class GatewayRunner:
         except Exception:
             pass
 
+        # Reset the session
+        new_entry = self.session_store.reset_session(session_key)
+
         # Clear any session-scoped model override so the next agent picks up
         # the configured default instead of the previously switched model.
         self._session_model_overrides.pop(session_key, None)
 
-        # Reset the session
-        new_entry = self.session_store.reset_session(session_key)
-
         # Emit session:end hook (session is ending)
         await self.hooks.emit("session:end", {
             "platform": source.platform.value if source.platform else "",