diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt
index fd1e2e221d6..5c016ca9f7b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt
@@ -52,23 +52,12 @@ internal interface ToolchainSupport {
                             .getByType(JavaPluginExtension::class.java)
                             .toolchain
 
-                        val toolchainSpec = if (!javaToolchainSpec.languageVersion.isPresent) {
-                            // We can't reuse java toolchain and just set 'languageVersion' to it
-                            // as build will fail when java source and/or target compatibility is set
-                            project.objects.newInstance<DefaultToolchainSpec>().apply {
-                                languageVersion.set(
-                                    JavaLanguageVersion.of(
-                                        Jvm.current().javaVersion!!.majorVersion
-                                    )
-                                )
-                            }
-                        } else {
-                            javaToolchainSpec
+                        // Only set when toolchain is configured
+                        if (javaToolchainSpec.languageVersion.isPresent) {
+                            it.kotlinJavaToolchain.toolchain.use(
+                                javaToolchainService.launcherFor(javaToolchainSpec)
+                            )
                         }
-
-                        it.kotlinJavaToolchain.toolchain.use(
-                            javaToolchainService.launcherFor(toolchainSpec)
-                        )
                     }
             }
         }