diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index d32b332cd19..cd5c260e18f 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Duser.country=US
 # Should be the same as in the main project to avoid spawning second daemon
-kotlin.daemon.jvmargs=-Xmx3g
+kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true
 
 cacheRedirectorEnabled=true
 
diff --git a/gradle.properties b/gradle.properties
index 7f263b46fef..a0df68ddcd1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true
-kotlin.daemon.jvmargs=-Xmx3g
+kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true
 systemProp.file.encoding=UTF-8
 systemProp.user.country=US
 # Enable new incremental compiation