diff --git a/server/collector/src/main/java/org/bithon/server/collector/brpc/BrpcCollectorServer.java b/server/collector/src/main/java/org/bithon/server/collector/brpc/BrpcCollectorServer.java
index e8a0a2a57..43afb3dc5 100644
--- a/server/collector/src/main/java/org/bithon/server/collector/brpc/BrpcCollectorServer.java
+++ b/server/collector/src/main/java/org/bithon/server/collector/brpc/BrpcCollectorServer.java
@@ -20,14 +20,10 @@
 import lombok.extern.slf4j.Slf4j;
 import org.bithon.component.brpc.channel.BrpcServer;
 import org.bithon.component.brpc.channel.BrpcServerBuilder;
-import org.bithon.component.commons.concurrency.NamedThreadFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author frank.chen021@outlook.com
@@ -56,6 +52,7 @@ public synchronized ServiceGroup addService(String group, Object implementation,
             // Create a server with the first service name as the server id
             serviceGroup.brpcServer = BrpcServerBuilder.builder()
                                                        .serverId(group)
+                                                       /*
                                                        .executor(new ThreadPoolExecutor(1,
                                                                                         Runtime.getRuntime().availableProcessors(),
                                                                                         3,
@@ -63,6 +60,8 @@ public synchronized ServiceGroup addService(String group, Object implementation,
                                                                                         new LinkedBlockingQueue<>(1024),
                                                                                         NamedThreadFactory.of("brpc-executor-" + group),
                                                                                         new ThreadPoolExecutor.CallerRunsPolicy()))
+                                                        */
+                                                       .executor(Runnable::run)
                                                        .build();
             serviceGroup.start(port);
             log.info("Started Brpc services [{}] at port {}",