diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py
index c9e3ca06b..b4c92aa18 100644
--- a/recipes/recipe_modules/bot_update/api.py
+++ b/recipes/recipe_modules/bot_update/api.py
@@ -243,7 +243,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
-    if disable_syntax_validation:
+    if disable_syntax_validation or cfg.disable_syntax_validation:
       cmd.append('--disable-syntax-validation')
 
     # Inject Json output for testing.
diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py
index 73b650282..ab1a1e713 100644
--- a/recipes/recipe_modules/gclient/config.py
+++ b/recipes/recipe_modules/gclient/config.py
@@ -90,6 +90,8 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
         required=False,
         hidden=True),
 
+    disable_syntax_validation = Single(bool, empty_val=False, required=False),
+
     USE_MIRROR = Static(bool(USE_MIRROR)),
     # TODO(tandrii): remove PATCH_PROJECT field.
     # DON'T USE THIS. WILL BE REMOVED.
@@ -106,6 +108,10 @@ def ChromiumGitURL(_c, *pieces):
 def ChromeInternalGitURL(_c, *pieces):  # pragma: no cover
   return '/'.join(('https://chrome-internal.googlesource.com',) + pieces)
 
+@config_ctx()
+def disable_syntax_validation(c):
+  c.disable_syntax_validation = True
+
 @config_ctx()
 def android(c):
   c.target_os.add('android')
diff --git a/recipes/recipe_modules/gclient/example.py b/recipes/recipe_modules/gclient/example.py
index b5a0d8216..54ed52604 100644
--- a/recipes/recipe_modules/gclient/example.py
+++ b/recipes/recipe_modules/gclient/example.py
@@ -20,6 +20,7 @@ TEST_CONFIGS = [
   'crashpad',
   'custom_tabs_client',
   'dart',
+  'disable_syntax_validation',
   'gerrit_test_cq_normal',
   'gyp',
   'infra',