diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt
index 0fac43918da..1b8de704c72 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt
@@ -5,13 +5,32 @@
 
 package org.jetbrains.kotlin.cli.jvm.compiler
 
-fun setupIdeaStandaloneExecution() {
-    System.getProperties().setProperty("idea.plugins.compatible.build", "201.6668.13")
-    System.getProperties().setProperty("project.structure.add.tools.jar.to.new.jdk", "false")
-    System.getProperties().setProperty("psi.track.invalidation", "true")
-    System.getProperties().setProperty("psi.incremental.reparse.depth.limit", "1000")
-    System.getProperties().setProperty("ide.hide.excluded.files", "false")
-    System.getProperties().setProperty("ast.loading.filter", "false")
-    System.getProperties().setProperty("idea.ignore.disabled.plugins", "true")
-    System.getProperties().setProperty("idea.home.path", System.getProperty("java.io.tmpdir"))
-}
\ No newline at end of file
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.diagnostic.Logger
+
+object IdeaStandaloneExecutionSetup {
+    private val LOG: Logger = Logger.getInstance(IdeaStandaloneExecutionSetup::class.java)
+
+    fun doSetup() {
+        checkInHeadlessMode()
+
+        System.getProperties().setProperty("project.structure.add.tools.jar.to.new.jdk", "false")
+        System.getProperties().setProperty("psi.track.invalidation", "true")
+        System.getProperties().setProperty("psi.incremental.reparse.depth.limit", "1000")
+        System.getProperties().setProperty("ide.hide.excluded.files", "false")
+        System.getProperties().setProperty("ast.loading.filter", "false")
+        System.getProperties().setProperty("idea.ignore.disabled.plugins", "true")
+        System.getProperties().setProperty("idea.home.path", System.getProperty("java.io.tmpdir"))
+    }
+
+    private fun checkInHeadlessMode() {
+        // if  application is null it means that we are in progress of set-up application environment i.e. we are not in the running IDEA
+        val application = ApplicationManager.getApplication() ?: return
+        if (!application.isHeadlessEnvironment) {
+            LOG.error(Throwable("IdeaStandaloneExecutionSetup should be called only in headless environment"))
+        }
+    }
+}
+
+// We safe this function to minimize the patch for release branches
+fun setupIdeaStandaloneExecution() = IdeaStandaloneExecutionSetup.doSetup()
\ No newline at end of file