diff --git a/cli/src/main/conf/windowsBinTemplate.bat b/cli/src/main/conf/windowsBinTemplate.bat
index 18f3506ccf0..7f56df80811 100644
--- a/cli/src/main/conf/windowsBinTemplate.bat
+++ b/cli/src/main/conf/windowsBinTemplate.bat
@@ -50,7 +50,10 @@ for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 set REPO=
 #ENV_SETUP#
 
-if "%JAVACMD%"=="" set JAVACMD=#JAVA_BINARY#
+if "%JAVACMD%"=="" (
+    set "JAVACMD=#JAVA_BINARY#"
+    if not "%JAVA_HOME%"=="" if exist "%JAVA_HOME%\bin\java.exe" set "JAVACMD=%JAVA_HOME%\bin\java.exe"
+)
 
 if "%REPO%"=="" set REPO=%BASEDIR%\#REPO#