diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index 1254e38d3a..f7d4394dc8 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -50,8 +50,12 @@ IF ERRORLEVEL 1 (
     GOTO :popd_error
 )
 
-ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% -D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%
-"!CPACK_PATH!"  -C %CONFIGURATION% -D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%
+IF NOT "%CPACK_BUCKET%"=="" (
+    SET "CPACK_OPTIONS=-D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%"
+)
+
+ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS%
+"!CPACK_PATH!"  -C %CONFIGURATION% %CPACK_OPTIONS%
 IF NOT %ERRORLEVEL%==0 (
     REM dump the log file generated by cpack specifically for WIX
     ECHO ****************************************************************