diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.py
index 5fe0ee0..dc76441 100644
--- a/nanobot/agent/loop.py
+++ b/nanobot/agent/loop.py
@@ -139,7 +139,7 @@ class AgentLoop:
             await self._mcp_stack.__aenter__()
             await connect_mcp_servers(self._mcp_servers, self.tools, self._mcp_stack)
             self._mcp_connected = True
-        except Exception as e:
+        except BaseException as e:
             logger.error("Failed to connect MCP servers (will retry next message): {}", e)
             if self._mcp_stack:
                 try: