diff --git a/src/serena/mcp.py b/src/serena/mcp.py
index abc9cb5..a6c471b 100644
--- a/src/serena/mcp.py
+++ b/src/serena/mcp.py
@@ -160,7 +160,8 @@ def create_mcp_server_and_agent(
         nonlocal agent
         mark_used(mcp_server)
         yield
-        agent.language_server.stop()
+        if agent.language_server is not None:
+            agent.language_server.stop()
 
     mcp_settings = Settings(lifespan=server_lifespan, host=host, port=port)
     mcp = FastMCP(**mcp_settings.model_dump())