diff --git a/ext/completion_queue_threadpool.cc b/ext/completion_queue_threadpool.cc
index b5227bad..0b8bc019 100644
--- a/ext/completion_queue_threadpool.cc
+++ b/ext/completion_queue_threadpool.cc
@@ -141,8 +141,7 @@ void CompletionQueueAsyncWorker::Init(Local<Object> exports) {
   Nan::HandleScope scope;
   current_threads = 0;
   waiting_next_calls = 0;
-  queue =
-      grpc_completion_queue_create(GRPC_CQ_NEXT, GRPC_CQ_DEFAULT_POLLING, NULL);
+  queue = grpc_completion_queue_create_for_next(NULL);
 }
 
 void CompletionQueueAsyncWorker::HandleOKCallback() {
diff --git a/ext/completion_queue_uv.cc b/ext/completion_queue_uv.cc
index 9c1f093a..72900501 100644
--- a/ext/completion_queue_uv.cc
+++ b/ext/completion_queue_uv.cc
@@ -92,8 +92,7 @@ void CompletionQueueNext() {
 }
 
 void CompletionQueueInit(Local<Object> exports) {
-  queue =
-      grpc_completion_queue_create(GRPC_CQ_NEXT, GRPC_CQ_DEFAULT_POLLING, NULL);
+  queue = grpc_completion_queue_create_for_next(NULL);
   uv_prepare_init(uv_default_loop(), &prepare);
   pending_batches = 0;
 }
diff --git a/ext/server_generic.cc b/ext/server_generic.cc
index 787605ae..24573bd5 100644
--- a/ext/server_generic.cc
+++ b/ext/server_generic.cc
@@ -44,8 +44,7 @@ namespace grpc {
 namespace node {
 
 Server::Server(grpc_server *server) : wrapped_server(server) {
-  shutdown_queue = grpc_completion_queue_create(GRPC_CQ_PLUCK,
-                                                GRPC_CQ_DEFAULT_POLLING, NULL);
+  shutdown_queue = grpc_completion_queue_create_for_pluck(NULL);
   grpc_server_register_non_listening_completion_queue(server, shutdown_queue,
                                                       NULL);
 }