diff --git a/Build/scripts/add_msbuild_path.cmd b/Build/scripts/add_msbuild_path.cmd
index 538aa72cb6f..9feef583ddb 100644
--- a/Build/scripts/add_msbuild_path.cmd
+++ b/Build/scripts/add_msbuild_path.cmd
@@ -26,6 +26,10 @@ echo Trying to locate Dev15...
 set MSBUILD_VERSION=15.0
 set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Enterprise\MSBuild\15.0\Bin"
 
+if not exist "%MSBUILD_PATH%\msbuild.exe" (
+    set "MSBUILD_PATH=%VSINSTALLDIR%MSBuild\%MSBUILD_VERSION%\Bin"
+)
+
 if not exist "%MSBUILD_PATH%\msbuild.exe" (
     set "MSBUILD_PATH=%ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\MSBuild\%MSBUILD_VERSION%\Bin\x86"
 )