diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh
index b4d633768..e2a757eaa 100644
--- a/tools/windows/windows_install_prerequisites.sh
+++ b/tools/windows/windows_install_prerequisites.sh
@@ -35,6 +35,10 @@ pacman --noconfirm -Syu # This step may require the terminal to be closed and re
 
 pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim mingw-w64-i686-python2-pip unzip winpty
 
+# Workaround for errors when running "git submodule" commands
+# See https://github.com/Alexpux/MSYS2-packages/issues/735
+rm /mingw32/bin/envsubst.exe
+
 python -m pip install --upgrade pip
 
 pip install pyserial