diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/dapms/sync/CustomWebMvcSseServerTransportProvider.java b/dap-gateway/src/main/java/io/shinhanlife/dap/dapms/sync/CustomWebMvcSseServerTransportProvider.java
index f89866d..66853a9 100644
--- a/dap-gateway/src/main/java/io/shinhanlife/dap/dapms/sync/CustomWebMvcSseServerTransportProvider.java
+++ b/dap-gateway/src/main/java/io/shinhanlife/dap/dapms/sync/CustomWebMvcSseServerTransportProvider.java
@@ -95,8 +95,8 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
         McpServerSession session = sessionFactory.create(sessionTransport);
         sessions.put(sessionId, session);
 
-        emitter.onCompletion(() -> sessions.remove(sessionId));
-        emitter.onTimeout(() -> sessions.remove(sessionId));
+        // emitter.onCompletion(() -> sessions.remove(sessionId));
+        // emitter.onTimeout(() -> sessions.remove(sessionId));
 
         new Thread(() -> {
             try {