diff --git a/tensorflow_serving/apis/BUILD b/tensorflow_serving/apis/BUILD
index 43e03a87c9a..fc3663fdb3f 100644
--- a/tensorflow_serving/apis/BUILD
+++ b/tensorflow_serving/apis/BUILD
@@ -194,6 +194,7 @@ serving_proto_library(
     srcs = ["prediction_service.proto"],
     has_services = 1,
     cc_grpc_version = 1,
+    use_java_stubby_library = False,
     deps = [
         ":classification_proto",
         ":get_model_metadata_proto",
diff --git a/tensorflow_serving/apis/prediction_service.proto b/tensorflow_serving/apis/prediction_service.proto
index 44e655417fd..a0f0434584f 100644
--- a/tensorflow_serving/apis/prediction_service.proto
+++ b/tensorflow_serving/apis/prediction_service.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package tensorflow.serving;
 option cc_enable_arenas = true;
+option use_java_stubby_library = false;
 
 import "tensorflow_serving/apis/classification.proto";
 import "tensorflow_serving/apis/get_model_metadata.proto";