diff --git a/vendor/clink.lua b/vendor/clink.lua
index 7fbf55a..3bd5b72 100644
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@@ -74,9 +74,9 @@ local cached_info = {}
 if clink.promptcoroutine and io.popenyield then
     io_popenyield = io.popenyield
     clink_promptcoroutine = clink.promptcoroutine
-    -- Uncommenting this will override the cmderGitStatusOptIn and always show
-    -- git status when Clink is able to run it in the background.
-    --cmderForceAsyncGitStatus = true
+    if prompt_overrideGitStatusOptIn then
+        cmderForceAsyncGitStatus = true
+    end
 else
     io_popenyield = io.popen
     clink_promptcoroutine = function (func)
diff --git a/vendor/cmder_prompt_config.lua.default b/vendor/cmder_prompt_config.lua.default
index e5ae224..045a0d7 100644
--- a/vendor/cmder_prompt_config.lua.default
+++ b/vendor/cmder_prompt_config.lua.default
@@ -29,6 +29,11 @@ prompt_useUserAtHost = false
  -- default is false
 prompt_singleLine = false
 
+-- OPTIONAL. If true then always ignore the cmder.status and cmder.cmdstatus git config settings and run the git prompt commands in the background.
+ -- default is false
+ -- NOTE: This only takes effect if using Clink v1.2.10 or higher.
+prompt_overrideGitStatusOptIn = false
+
 -- Prompt Attributes
 --
 -- Colors