diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c
index e48d2f8f468342d6304f6d18ff2a6963747eef91..be1a4a1df519c502f6fb802a2b2b2a6d1a066b93 100644
--- a/src/core/lib/surface/completion_queue.c
+++ b/src/core/lib/surface/completion_queue.c
@@ -310,7 +310,7 @@ grpc_cq_completion_type grpc_get_cq_completion_type(grpc_completion_queue *cc) {
   return cc->completion_type;
 }
 
-gpr_atm grpc_get_cq_poll_num(grpc_completion_queue *cc) {
+int grpc_get_cq_poll_num(grpc_completion_queue *cc) {
   int cur_num_polls;
   gpr_mu_lock(cc->mu);
   cur_num_polls = cc->num_polls;
diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h
index d8c812f2aee0df61c362c15f2628e4709dfacfba..add52e8a07682da1f2ec2feb0e3a0fa003fef5c3 100644
--- a/src/core/lib/surface/completion_queue.h
+++ b/src/core/lib/surface/completion_queue.h
@@ -100,7 +100,7 @@ bool grpc_cq_can_listen(grpc_completion_queue *cc);
 
 grpc_cq_completion_type grpc_get_cq_completion_type(grpc_completion_queue *cc);
 
-gpr_atm grpc_get_cq_poll_num(grpc_completion_queue *cc);
+int grpc_get_cq_poll_num(grpc_completion_queue *cc);
 
 grpc_completion_queue *grpc_completion_queue_create_internal(
     grpc_cq_completion_type completion_type, grpc_cq_polling_type polling_type);
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index 3aa82683110658da385135232558020f2b28e88e..b94302d2f4cd2c85503dcb05adb4fd17ef4ec794 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -208,7 +208,7 @@ class AsyncClient : public ClientImpl<StubType, RequestType> {
   int GetPollCount() override {
     int count = 0;
     for (auto cq = cli_cqs_.begin(); cq != cli_cqs_.end(); cq++) {
-      count += (int)grpc_get_cq_poll_num((*cq)->cq());
+      count += grpc_get_cq_poll_num((*cq)->cq());
     }
     return count;
   }
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index 952b33411916e58fa1b65efcfcf92453adec401d..3403ffd326688427ad77039df9c2692de5d02ec4 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -189,7 +189,7 @@ class AsyncQpsServerTest final : public grpc::testing::Server {
   int GetPollCount() override {
     int count = 0;
     for (auto cq = srv_cqs_.begin(); cq != srv_cqs_.end(); cq++) {
-      count += (int)grpc_get_cq_poll_num((*cq)->cq());
+      count += grpc_get_cq_poll_num((*cq)->cq());
     }
     return count;
   }