diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 4932f20ba18..cfa77a8fd3a 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -799,7 +799,7 @@ grpc_call_error grpc_call_server_end_initial_metadata(grpc_call *call,
   return err;
 }
 
-void grpc_call_client_initial_metadata_complete(
+void grpc_call_initial_metadata_complete(
     grpc_call_element *surface_element) {
   grpc_call *call = grpc_call_from_top_element(surface_element);
   lock(call);
diff --git a/src/core/surface/call.h b/src/core/surface/call.h
index 10f8dbe6c8f..57592089eef 100644
--- a/src/core/surface/call.h
+++ b/src/core/surface/call.h
@@ -62,9 +62,8 @@ grpc_call_error grpc_call_start_ioreq_and_call_back(
     grpc_call *call, const grpc_ioreq *reqs, size_t nreqs,
     grpc_ioreq_completion_func on_complete, void *user_data);
 
-/* Called when it's known that the initial batch of metadata is complete on the
-   client side (must not be called on the server) */
-void grpc_call_client_initial_metadata_complete(
+/* Called when it's known that the initial batch of metadata is complete */
+void grpc_call_initial_metadata_complete(
     grpc_call_element *surface_element);
 
 void grpc_call_set_deadline(grpc_call_element *surface_element,
diff --git a/src/core/surface/client.c b/src/core/surface/client.c
index 42f46fdaa66..fa63e855cc8 100644
--- a/src/core/surface/client.c
+++ b/src/core/surface/client.c
@@ -72,7 +72,7 @@ static void call_op(grpc_call_element *elem, grpc_call_element *from_elem,
       grpc_call_stream_closed(elem);
       break;
     case GRPC_RECV_END_OF_INITIAL_METADATA:
-      grpc_call_client_initial_metadata_complete(elem);
+      grpc_call_initial_metadata_complete(elem);
       break;
     default:
       GPR_ASSERT(op->dir == GRPC_CALL_DOWN);
diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index ebdadd5c685..0f21a3aefb6 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -313,6 +313,7 @@ static void call_op(grpc_call_element *elem, grpc_call_element *from_elemn,
       break;
     case GRPC_RECV_END_OF_INITIAL_METADATA:
       start_new_rpc(elem);
+      grpc_call_initial_metadata_complete(elem);
       break;
     case GRPC_RECV_MESSAGE:
       grpc_call_recv_message(elem, op->data.message);