diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 02e820ea402..adb248569e7 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,4 +1,7 @@
-org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8
+# Decreasing Kotlin Daemon autoshutdown timeout to 30 seconds
+# Currently all other modules in Kotlin repo are using custom compiler classpath
+# making daemon spawned in 'buildSrc' compilation incompatible with other compilations
+org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dkotlin.daemon.options=autoshutdownIdleSeconds=30
 # Should be the same as in the main project to avoid spawning second daemon
 kotlin.daemon.jvmargs=-Xmx2200m
 
@@ -11,4 +14,4 @@ kotlin.build.gradlePlugin.version=0.0.38
 
 # Please keep it in sync with root gradle.properties.
 # It's currently needed for proper configuration cache work, the reason will be investigated later
-org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,JDK_15,JDK_16_0,JDK_17_0
\ No newline at end of file
+org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,JDK_15,JDK_16_0,JDK_17_0