diff --git a/src/config/request_context.rs b/src/config/request_context.rs
index 6e4102c..f2ac833 100644
--- a/src/config/request_context.rs
+++ b/src/config/request_context.rs
@@ -1976,6 +1976,10 @@ impl RequestContext {
         abort_signal: AbortSignal,
     ) -> Result<()> {
         let role = self.retrieve_role(app, name)?;
+        if let Some(session) = self.session.as_mut() {
+            session.guard_empty()?;
+        }
+
         let mcp_servers = if app.mcp_server_support {
             role.enabled_mcp_servers()
         } else {