diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java
index 61376d0e16c..a45b399d4e9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java
+++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java
@@ -70,7 +70,5 @@ public class PluginStartupComponent implements ApplicationComponent {
     }
 
     @Override
-    public void disposeComponent() {
-        KotlinCompilerClient.Companion.shutdownCompileService();
-    }
+    public void disposeComponent() {}
 }
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index d5c30d7b59c..b53e3bec6c2 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.jps.build
 
 import com.intellij.util.PathUtil
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
+import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY
+import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY
 import org.jetbrains.kotlin.test.JetTestUtils
+import java.io.File
 
 public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
 
@@ -104,4 +107,18 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         addKotlinRuntimeDependency()
         rebuildAll()
     }
+
+    public fun testThreeModulesNoReexportWithDaemon() {
+        System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"")
+        val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running");
+        try {
+            System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
+            testThreeModulesNoReexport()
+        }
+        finally {
+            flagFile.delete()
+            System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY)
+            System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY)
+        }
+    }
 }