diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 46f7d134..ccb91127 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -9,6 +9,7 @@ _command_exists git || return 0
 # Don't handle completion if it's already managed
 ! complete -p git &>/dev/null || return 0
 
+_git_bash_completion_found=false
 _git_bash_completion_paths=(
   # MacOS non-system locations
   '/Library/Developer/CommandLineTools/usr/share/git-core/git-completion.bash'
@@ -17,11 +18,14 @@ _git_bash_completion_paths=(
 
 for _comp_path in "${_git_bash_completion_paths[@]}" ; do
   if [ -r "$_comp_path" ] ; then
+    _git_bash_completion_found=true
     source "$_comp_path"
-    unset _git_bash_completion_paths
-    return
+    break
   fi
 done
 
+if ! _git_bash_completion_found ; then
+  _log_warning "no completion files found - please try enabling the 'system' completion instead."
+fi
 unset _git_bash_completion_paths
-_log_warning "no completion files found - please try enabling the 'system' completion instead."
+unset _git_bash_completion_found