diff --git a/firmware/bin/upload_bundle.sh b/firmware/bin/upload_bundle.sh
index 81103b35a4..322ebbd868 100755
--- a/firmware/bin/upload_bundle.sh
+++ b/firmware/bin/upload_bundle.sh
@@ -5,10 +5,10 @@ SCRIPT_NAME=$(basename "$0")
 FULL_BUNDLE_FILE="rusefi_bundle_${BUNDLE_NAME}.zip"
 UPDATE_BUNDLE_FILE="rusefi_bundle_${BUNDLE_NAME}_autoupdate.zip"
 
-if [ -n "$RUSEFI_SSH_USER" ]; then
+if [ -n "$RUSEFI_SSH_USER" -a -n "$RUSEFI_SSH_PASS" -a -n "$RUSEFI_SSH_SERVER" ]; then
  echo "$SCRIPT_NAME: Uploading full bundle"
  RET=0
- if [ "${LTS}" = "true" ]; then
+ if [ "$LTS" == "true" -a -n "$REF" ]; then
    tar -czf - $FULL_BUNDLE_FILE  | sshpass -p $RUSEFI_SSH_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_SSH_USER@$RUSEFI_SSH_SERVER "mkdir -p build_server/lts/${REF}; tar -xzf - -C build_server/lts/${REF}"
 	 RET=$((RET+$?))
    tar -czf - $UPDATE_BUNDLE_FILE  | sshpass -p $RUSEFI_SSH_PASS ssh -o StrictHostKeyChecking=no $RUSEFI_SSH_USER@$RUSEFI_SSH_SERVER "mkdir -p build_server/lts/${REF}/autoupdate; tar -xzf - -C build_server/lts/${REF}/autoupdate"