diff --git a/api/src/main/java/io/grpc/ServerInterceptors.java b/api/src/main/java/io/grpc/ServerInterceptors.java
index dc1b0609d9b..6110cf9ca25 100644
--- a/api/src/main/java/io/grpc/ServerInterceptors.java
+++ b/api/src/main/java/io/grpc/ServerInterceptors.java
@@ -187,10 +187,15 @@ public static <T> ServerServiceDefinition useMarshalledMessages(
       wrappedMethods.add(wrapMethod(definition, wrappedMethodDescriptor));
     }
     // Build the new service descriptor
-    final ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition
-        .builder(new ServiceDescriptor(serviceDef.getServiceDescriptor().getName(),
-            wrappedDescriptors));
-    // Create the new service definiton.
+    final ServiceDescriptor.Builder serviceDescriptorBuilder =
+        ServiceDescriptor.newBuilder(serviceDef.getServiceDescriptor().getName())
+            .setSchemaDescriptor(serviceDef.getServiceDescriptor().getSchemaDescriptor());
+    for (MethodDescriptor<?, ?> wrappedDescriptor : wrappedDescriptors) {
+      serviceDescriptorBuilder.addMethod(wrappedDescriptor);
+    }
+    // Create the new service definition.
+    final ServerServiceDefinition.Builder serviceBuilder =
+        ServerServiceDefinition.builder(serviceDescriptorBuilder.build());
     for (ServerMethodDefinition<?, ?> definition : wrappedMethods) {
       serviceBuilder.addMethod(definition);
     }