diff --git a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
index 82b68271e75..3c521d6589a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
@@ -27,9 +27,9 @@ import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
 
 val Module.jsTestOutputFilePath: String?
     get() {
-        if (!shouldUseJpsOutput) {
-            (KotlinFacet.get(this)?.configuration?.settings?.testOutputPath)?.let { return it }
-        }
+        KotlinFacet.get(this)?.configuration?.settings?.testOutputPath?.let { return it }
+
+        if (!shouldUseJpsOutput) return null
 
         val compilerExtension = CompilerModuleExtension.getInstance(this)
         val outputDir = compilerExtension?.compilerOutputUrlForTests ?: return null
@@ -38,9 +38,9 @@ val Module.jsTestOutputFilePath: String?
 
 val Module.jsProductionOutputFilePath: String?
     get() {
-        if (!shouldUseJpsOutput) {
-            (KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath)?.let { return it }
-        }
+        KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath?.let { return it }
+
+        if (!shouldUseJpsOutput) return null
 
         val compilerExtension = CompilerModuleExtension.getInstance(this)
         val outputDir = compilerExtension?.compilerOutputUrl ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.181 b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.181
index 56891cb072d..e1cd87b5da2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.181
+++ b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.181
@@ -29,9 +29,9 @@ import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
 
 val Module.jsTestOutputFilePath: String?
     get() {
-        if (!shouldUseJpsOutput) {
-            (KotlinFacet.get(this)?.configuration?.settings?.testOutputPath)?.let { return it }
-        }
+        KotlinFacet.get(this)?.configuration?.settings?.testOutputPath?.let { return it }
+
+        if (!shouldUseJpsOutput) return null
 
         val compilerExtension = CompilerModuleExtension.getInstance(this)
         val outputDir = compilerExtension?.compilerOutputUrlForTests ?: return null
@@ -40,9 +40,9 @@ val Module.jsTestOutputFilePath: String?
 
 val Module.jsProductionOutputFilePath: String?
     get() {
-        if (!shouldUseJpsOutput) {
-            (KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath)?.let { return it }
-        }
+        KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath?.let { return it }
+
+        if (!shouldUseJpsOutput) return null
 
         val compilerExtension = CompilerModuleExtension.getInstance(this)
         val outputDir = compilerExtension?.compilerOutputUrl ?: return null