diff --git a/src/mcp/server/stdio.py b/src/mcp/server/stdio.py
index 876d256dd..ef737e8c1 100644
--- a/src/mcp/server/stdio.py
+++ b/src/mcp/server/stdio.py
@@ -68,7 +68,13 @@ async def stdout_writer():
                     json = session_message.message.model_dump_json(by_alias=True, exclude_unset=True)
                     await stdout.write(json + "\n")
                     await stdout.flush()
-        except anyio.ClosedResourceError:  # pragma: no cover
+        except (anyio.ClosedResourceError, BrokenPipeError, ConnectionResetError):  # pragma: no cover
+            # BrokenPipeError / ConnectionResetError occur when the parent
+            # process (MCP client) closes the stdout pipe — e.g. during
+            # restart, kill, or graceful shutdown. This is a graceful
+            # shutdown signal, not a crash — suppress it so the server
+            # exits cleanly instead of propagating an ExceptionGroup from
+            # anyio's TaskGroup.
             await anyio.lowlevel.checkpoint()
 
     async with anyio.create_task_group() as tg: