diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
index a557b301749..22f2f111759 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
@@ -206,10 +206,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
             val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, environment.messageCollector)
             val compilerPath = File(libPath, "kotlin-compiler.jar")
             val compilerId = CompilerId.makeCompilerId(compilerPath)
-            val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply {
-                deleteOnExit()
-            }
-            jpsDaemonConnection = newDaemonConnection(compilerId, flagFile, environment)
+            // TODO: pass daemon options to newDaemonConnection
+            val daemonOptions = configureDaemonOptions()
+            val flagFile = makeAutodeletingFlagFile("compiler-jps-session-", File(daemonOptions.runFilesPathOrDefault))
+            jpsDaemonConnection = newDaemonConnection(compilerId, flagFile, environment, daemonOptions)
         }
         return jpsDaemonConnection!!
     }