diff --git a/api/core/mcp/session/base_session.py b/api/core/mcp/session/base_session.py
index 42aeea3908..4b02ae9eda 100644
--- a/api/core/mcp/session/base_session.py
+++ b/api/core/mcp/session/base_session.py
@@ -194,7 +194,7 @@ class BaseSession(
         if self._receiver_future:
             try:
                 self._receiver_future.result(timeout=5.0)  # Wait up to 5 seconds
-            except Exception:
+            except concurrent.futures.TimeoutError:
                 # If the receiver loop is still running after timeout, we'll force shutdown
                 pass