diff --git a/client/proxy/xtcp.go b/client/proxy/xtcp.go
index 31f9ac89..6dc4f049 100644
--- a/client/proxy/xtcp.go
+++ b/client/proxy/xtcp.go
@@ -151,7 +151,7 @@ func (pxy *XTCPProxy) listenByKCP(listenConn *net.UDPConn, raddr *net.UDPAddr, s
 	defer session.Close()
 
 	for {
-		muxConn, err := session.Accept()
+		muxConn, err := session.AcceptStreamWithContext(pxy.ctx)
 		if err != nil {
 			xl.Errorf("accept connection error: %v", err)
 			return
diff --git a/server/service.go b/server/service.go
index 325f7f6c..0cfa5ed6 100644
--- a/server/service.go
+++ b/server/service.go
@@ -519,7 +519,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) {
 				}
 
 				for {
-					stream, err := session.AcceptStream()
+					stream, err := session.AcceptStreamWithContext(ctx)
 					if err != nil {
 						log.Debugf("Accept new mux stream error: %v", err)
 						session.Close()