diff --git a/update_depot_tools b/update_depot_tools
index 6cb3500d03..afa5915a43 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -143,14 +143,14 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
   source "$base_dir/cipd_bin_setup.sh"
   cipd_bin_setup
 
-  # Restart goma if it is updated.
-  goma_ctl update_hook
-
   # Don't bootstrap Python 3 on windows, since it is already done by
   # bootstrap/win_tools.bat.
   if [ "X$MINGW" != "X0" -a "X$DEPOT_TOOLS_BOOTSTRAP_PYTHON3" != "X0" ]; then
     source "$base_dir/bootstrap_python3"
     bootstrap_python3
   fi
+
+  # Restart goma if it is updated.
+  goma_ctl update_hook
 fi
 
diff --git a/update_depot_tools.bat b/update_depot_tools.bat
index 2787f408ec..8441525702 100644
--- a/update_depot_tools.bat
+++ b/update_depot_tools.bat
@@ -81,8 +81,8 @@ if errorlevel 1 (
 :: Sync CIPD and CIPD client tools.
 call "%~dp0\cipd_bin_setup.bat"
 
+:: Update git and python.
+call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
+
 :: Restart goma if it is updated.
 call "%~dp0\goma_ctl.bat" update_hook
-
-:: Update git and python
-call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"