diff --git a/build.gradle.kts b/build.gradle.kts
index 1baa31cbe56..5287ecda690 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,7 +27,7 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 39269ebb7a1..b0092295848 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
@@ -97,7 +97,7 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
     implementation("com.gradle.publish:plugin-publish-plugin:0.11.0")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index 87ad25ec78b..42b31ffc7f0 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
     }
 }
 
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index 2f39a00bf9a..d57dfef4ef3 100644
--- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.jetbrains.kotlin"
-version = "0.0.17"
+version = "0.0.18"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
index 5a348218964..9b4f72545e9 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
@@ -67,13 +67,7 @@ class KotlinBuildProperties(
     val isTeamcityBuild: Boolean = getBoolean("teamcity") || System.getenv("TEAMCITY_VERSION") != null
 
     val intellijUltimateEnabled: Boolean
-        get() {
-            val explicitlyEnabled = getBoolean("intellijUltimateEnabled")
-            if (!kotlinUltimateExists && explicitlyEnabled) {
-                error("intellijUltimateEnabled property is set, while kotlin-ultimate repository is not provided")
-            }
-            return kotlinUltimateExists && (explicitlyEnabled || isTeamcityBuild)
-        }
+        get() = getBoolean("intellijUltimateEnabled", isTeamcityBuild)
 
     val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled")
 
diff --git a/settings.gradle b/settings.gradle
index b7617fddac5..048abd42f54 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,7 +27,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.18")
     }
 }