diff --git a/build.gradle b/build.gradle
index ee6cb7c794..b86686504b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,7 +177,7 @@ subprojects {
 
     if (!project.hasProperty('errorProne') || errorProne.toBoolean()) {
         dependencies {
-            errorprone libs.errorprone.core
+            errorprone JavaVersion.current().isJava11Compatible() ? libs.errorprone.core : libs.errorprone.corejava8
         }
     } else {
         // Disable Error Prone
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ab7d5edca8..3217767ba5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,8 +26,9 @@ commons-math3 = "org.apache.commons:commons-math3:3.6.1"
 conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
 cronet-api = "org.chromium.net:cronet-api:92.4515.131"
 cronet-embedded = "org.chromium.net:cronet-embedded:102.5005.125"
-errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.14.0"
-errorprone-core = "com.google.errorprone:error_prone_core:2.10.0"
+errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.18.0"
+errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0"
+errorprone-core = "com.google.errorprone:error_prone_core:2.18.0"
 google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.9.0"
 google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" }
 google-auth-oauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "googleauth" }