diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index 39b8361891..fc9ca78139 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -44,7 +44,7 @@ java_rpc_toolchain = rule(
             executable = True,
         ),
         "_java_toolchain": attr.label(
-            default = Label("@bazel_tools//tools/jdk:toolchain"),
+            default = Label("@bazel_tools//tools/jdk:current_java_toolchain"),
         ),
         "_host_javabase": attr.label(
             cfg = "host",