diff --git a/mcp-spring/mcp-spring-webmvc/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java b/mcp-spring/mcp-spring-webmvc/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java
index f2d1d3e7..ab8fc570 100644
--- a/mcp-spring/mcp-spring-webmvc/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java
+++ b/mcp-spring/mcp-spring-webmvc/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java
@@ -217,6 +217,14 @@ private ServerResponse handleSseConnection(ServerRequest request) {
 		// Send initial endpoint event
 		try {
 			return ServerResponse.sse(sseBuilder -> {
+				sseBuilder.onComplete(() -> {
+					logger.debug("SSE connection completed for session: {}", sessionId);
+					sessions.remove(sessionId);
+				});
+				sseBuilder.onTimeout(() -> {
+					logger.debug("SSE connection timed out for session: {}", sessionId);
+					sessions.remove(sessionId);
+				});
 
 				ClientSession session = new ClientSession(sessionId, sseBuilder);
 				this.sessions.put(sessionId, session);