diff --git a/net/rpc/server/baseserver.go b/net/rpc/server/baseserver.go
index a4457bbb..1a38248f 100644
--- a/net/rpc/server/baseserver.go
+++ b/net/rpc/server/baseserver.go
@@ -66,7 +66,7 @@ func (s *BaseDrpcServer) serve(ctx context.Context, lis secureservice.ContextLis
 			return
 		default:
 		}
-		ctx, conn, err := lis.Accept(ctx)
+		cctx, conn, err := lis.Accept(ctx)
 		if err != nil {
 			if isTemporary(err) {
 				l.Debug("listener temporary accept error", zap.Error(err))
@@ -85,7 +85,7 @@ func (s *BaseDrpcServer) serve(ctx context.Context, lis secureservice.ContextLis
 			l.Error("listener accept error", zap.Error(err))
 			return
 		}
-		go s.serveConn(ctx, conn)
+		go s.serveConn(cctx, conn)
 	}
 }