diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index ab63d309ef8..3c65f2378b0 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -30,10 +30,8 @@ logger.info("buildCacheUrl=${buildProperties.buildCacheUrl}")
 logger.info("pushToBuildCache=${buildProperties.pushToBuildCache}")
 
 buildCache {
-    if (buildProperties.isTeamcityBuild) {
-        local {
-            enabled = false
-        }
+    local {
+        enabled = buildProperties.localBuildCacheEnabled
     }
 
     if (buildProperties.buildCacheUrl != null) {
diff --git a/settings.gradle b/settings.gradle
index d8a7c1e021b..097d89ae790 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -52,10 +52,8 @@ logger.info("buildCacheUrl=${buildProperties.buildCacheUrl}")
 logger.info("pushToBuildCache=${buildProperties.pushToBuildCache}")
 
 buildCache {
-    if (buildProperties.isTeamcityBuild) {
-        local {
-            enabled = false
-        }
+    local {
+        enabled = buildProperties.localBuildCacheEnabled
     }
 
     if (buildProperties.buildCacheUrl != null) {