diff --git a/src/cpp/server/async_server_context.cc b/src/cpp/server/async_server_context.cc
index 5fd593158ac..f44678b5699 100644
--- a/src/cpp/server/async_server_context.cc
+++ b/src/cpp/server/async_server_context.cc
@@ -54,7 +54,8 @@ AsyncServerContext::AsyncServerContext(
 AsyncServerContext::~AsyncServerContext() { grpc_call_destroy(call_); }
 
 void AsyncServerContext::Accept(grpc_completion_queue* cq) {
-  grpc_call_accept(call_, cq, this, 0);
+  GPR_ASSERT(grpc_call_server_accept(call_, cq, this) == GRPC_CALL_OK);
+  GPR_ASSERT(grpc_call_server_end_initial_metadata(call_, 0) == GRPC_CALL_OK);
 }
 
 bool AsyncServerContext::StartRead(google::protobuf::Message* request) {
diff --git a/src/cpp/stream/stream_context.cc b/src/cpp/stream/stream_context.cc
index f5d303d5508..22b7e7d494b 100644
--- a/src/cpp/stream/stream_context.cc
+++ b/src/cpp/stream/stream_context.cc
@@ -89,8 +89,10 @@ void StreamContext::Start(bool buffered) {
   } else {
     // TODO(yangg) metadata needs to be added before accept
     // TODO(yangg) correctly set flag to accept
-    grpc_call_error error = grpc_call_accept(call(), cq(), finished_tag(), 0);
-    GPR_ASSERT(GRPC_CALL_OK == error);
+    GPR_ASSERT(grpc_call_server_accept(call(), cq(), finished_tag()) ==
+               GRPC_CALL_OK);
+    GPR_ASSERT(grpc_call_server_end_initial_metadata(call(), 0) ==
+               GRPC_CALL_OK);
   }
 }