diff --git a/build.gradle.kts b/build.gradle.kts
index f22c545722d..c318bfa3ef8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -144,9 +144,9 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
     else v.toBoolean()
 }
 
-val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled")
-                              ?: project.hasProperty("teamcity")
-                              || System.getenv("TEAMCITY_VERSION") != null
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
+
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
 
 extra["intellijUltimateEnabled"] = intellijUltimateEnabled
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 28bdc65f49a..9dbc2f5a8ed 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -41,9 +41,8 @@ rootProject.apply {
     from(rootProject.file("../versions.gradle.kts"))
 }
 
-val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled")
-                                     ?: project.hasProperty("teamcity")
-                                     || System.getenv("TEAMCITY_VERSION") != null)
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild)
 val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
 
 extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"