diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e6d3ce151365..6f56929605ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,19 +25,13 @@ ant = { module = "org.apache.ant:ant", version.ref = "ant" }
 ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" }
 ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" }
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-
-# check whether the Java condition in platform-tooling-support-tests.gradle.kts can be changed when updating
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.4.1" }
-
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" }
 commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
-
-# check whether JDK 26 condition in junitbuild.java-nullability-conventions.gradle.kts can be removed when updating
-errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.41.0" }
-
+errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" }
 fastcsv = { module = "de.siegmar:fastcsv", version = "4.0.0" }
 groovy = { module = "org.apache.groovy:groovy", version = "5.0.1" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
index 7cf0249cd005..2bef782b14ed 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
@@ -27,10 +27,7 @@ nullaway {
 
 tasks.withType<JavaCompile>().configureEach {
 	options.errorprone {
-		val onJ9 = java.toolchain.implementation.orNull == JvmImplementation.J9
-		// Workaround for https://github.com/google/error-prone/issues/5200
-		val onJdk26 = java.toolchain.languageVersion.get() >= JavaLanguageVersion.of(26)
-		val shouldDisableErrorProne = onJ9 || onJdk26
+		val shouldDisableErrorProne = java.toolchain.implementation.orNull == JvmImplementation.J9
 		if (name == "compileJava" && !shouldDisableErrorProne) {
 			disable(