diff --git a/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts b/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
index e127997ebc9..f9cee6c7225 100644
--- a/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
+++ b/libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
@@ -9,7 +9,7 @@ configureKotlinCompileTasksGradleCompatibility()
 extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
 
 dependencies {
-    compileOnly(project(":kotlin-stdlib"))
+    compileOnly(kotlinStdlib())
 }
 
 tasks.withType<KotlinJvmCompile>().configureEach {
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index 71e28677912..4d9ddd881e5 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -90,13 +90,15 @@ dependencies {
         exclude(group = "*")
     }
 
-    // Adding workaround KT-57317 for Gradle versions where Kotlin runtime <1.8.0
-    mainEmbedded(project(":kotlin-build-tools-enum-compat"))
-    gradle70Embedded(project(":kotlin-build-tools-enum-compat"))
-    gradle71Embedded(project(":kotlin-build-tools-enum-compat"))
-    gradle74Embedded(project(":kotlin-build-tools-enum-compat"))
-    gradle75Embedded(project(":kotlin-build-tools-enum-compat"))
-    gradle76Embedded(project(":kotlin-build-tools-enum-compat"))
+    if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
+        // Adding workaround KT-57317 for Gradle versions where Kotlin runtime <1.8.0
+        "mainEmbedded"(project(":kotlin-build-tools-enum-compat"))
+        "gradle70Embedded"(project(":kotlin-build-tools-enum-compat"))
+        "gradle71Embedded"(project(":kotlin-build-tools-enum-compat"))
+        "gradle74Embedded"(project(":kotlin-build-tools-enum-compat"))
+        "gradle75Embedded"(project(":kotlin-build-tools-enum-compat"))
+        "gradle76Embedded"(project(":kotlin-build-tools-enum-compat"))
+    }
 
     testCompileOnly(project(":compiler"))
     testCompileOnly(project(":kotlin-annotation-processing"))