diff --git a/update_depot_tools b/update_depot_tools
index 417b15d5a..d15ca563c 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -99,9 +99,14 @@ function update_git_repo {
     fi
   fi
 
+  # depot_tools.zip archives generated before 2021-03-12 have instruction to
+  # fetch  only from old default git branch. Such branch won't be available
+  # evenutally, so fetch config needs to be updated.
+  git config --unset-all remote.origin.fetch
+  git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
   git fetch -q origin &> /dev/null
   local CHECKOUT_TXT STATUS
-  CHECKOUT_TXT=$(git checkout -q origin/master 2>&1)
+  CHECKOUT_TXT=$(git checkout -q origin/main 2>&1)
   STATUS=$?
   if [[ $STATUS -ne 0 ]]; then
     echo "depot_tools update failed. Conflict in $base_dir" >&2
diff --git a/update_depot_tools.bat b/update_depot_tools.bat
index 4df4d44d8..14eaa815d 100644
--- a/update_depot_tools.bat
+++ b/update_depot_tools.bat
@@ -51,8 +51,13 @@ for /F %%x in ('git config --get remote.origin.url') DO (
     )
   )
 )
+:: depot_tools.zip archives generated before 2021-03-12 have instruction to
+:: fetch  only from old default git branch. Such branch won't be available
+:: evenutally, so fetch config needs to be updated.
+call git config --unset-all remote.origin.fetch
+call git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
 call git fetch -q origin > NUL
-call git checkout -q origin/master > NUL
+call git checkout -q origin/main > NUL
 if errorlevel 1 (
   echo Failed to update depot_tools.
   goto :EOF