diff --git a/include/grpcpp/impl/codegen/client_context_impl.h b/include/grpcpp/impl/codegen/client_context_impl.h
index 638ea641bed..7a543055b4b 100644
--- a/include/grpcpp/impl/codegen/client_context_impl.h
+++ b/include/grpcpp/impl/codegen/client_context_impl.h
@@ -85,6 +85,7 @@ class ClientCallbackReaderImpl;
 template <class Request>
 class ClientCallbackWriterImpl;
 class ClientCallbackUnaryImpl;
+class ClientContextAccessor;
 }  // namespace internal
 
 class CallCredentials;
@@ -424,6 +425,7 @@ class ClientContext {
   template <class Request>
   friend class ::grpc_impl::internal::ClientCallbackWriterImpl;
   friend class ::grpc_impl::internal::ClientCallbackUnaryImpl;
+  friend class ::grpc_impl::internal::ClientContextAccessor;
 
   // Used by friend class CallOpClientRecvStatus
   void set_debug_error_string(const grpc::string& debug_error_string) {