diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc
index 1d9d8a53f7bbce..82404d76d6176e 100644
--- a/src/core/lib/iomgr/tcp_server_posix.cc
+++ b/src/core/lib/iomgr/tcp_server_posix.cc
@@ -445,12 +445,17 @@ static void on_read(void* arg, grpc_error_handle err) {
               addr_uri->c_str());
     }
 
+    // addr_st format: ipv4/ipv6:ipv6:port
+    std::size_t start = addr_str.find_first_of(":") + 1;
+    std::size_t end = addr_str.find(":", start);
+    std::string ip = addr_str.substr(start, end - start);
+
     std::string name = absl::StrCat("tcp-server-connection:", addr_uri.value());
     grpc_fd* fdobj = grpc_fd_create(fd, name.c_str(), true);
 
     read_notifier_pollset = (*(sp->server->pollsets))
         [static_cast<size_t>(gpr_atm_no_barrier_fetch_add(
-             &sp->server->next_pollset_to_assign, 1)) %
+             &sp->server->next_pollset_to_assign_ids[ip], 1)) %
          sp->server->pollsets->size()];
 
     grpc_pollset_add_fd(read_notifier_pollset, fdobj);
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h
index afe6833e60d947..088f2614ada335 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix.h
+++ b/src/core/lib/iomgr/tcp_server_utils_posix.h
@@ -32,6 +32,7 @@
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
+#include <map>
 
 // one listening port
 typedef struct grpc_tcp_listener {
@@ -98,8 +99,8 @@ struct grpc_tcp_server {
   // owned by this struct
   const std::vector<grpc_pollset*>* pollsets = nullptr;
 
-  // next pollset to assign a channel to
-  gpr_atm next_pollset_to_assign = 0;
+  // next pollset to assign a channel to, it is a map from pollset name to ip address.
+  std::map<std::string, gpr_atm>  next_pollset_to_assign_ids;
 
   // Contains config extracted from channel args for this server
   grpc_core::PosixTcpOptions options;