diff --git a/build.gradle b/build.gradle
index 871a458bce..14c9d18814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -213,7 +213,7 @@ subprojects {
         failOnError = true
         maxMemory = "1024M"
         javadocTool = javaToolchains.javadocToolFor {
-            languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+            languageVersion = JavaLanguageVersion.of(jdkVersion)
         }
 
         doFirst {
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 3947004c16..1e72a8f778 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -59,7 +59,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index b7a9409020..4afc271d4f 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -69,7 +69,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index f37056df85..79c7ec1a4b 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -60,7 +60,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 2571146f90..ed9c007d23 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -207,7 +207,7 @@ task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava', ':poi:testJar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(TEST9_OUT + VERSIONS9)
diff --git a/poi/build.gradle b/poi/build.gradle
index 42ddb9d1fa..ec0aa868e9 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)
     source = file(JAVA9_SRC)