diff --git a/plugins/builder-dockerfile/builder-build b/plugins/builder-dockerfile/builder-build
index 68c7e8399..f8c8c46fa 100755
--- a/plugins/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -236,8 +236,11 @@ trigger-builder-dockerfile-builder-build() {
         shift 1
         ;;
       *)
-        shift
-        continue
+        if [[ -n "$1" ]]; then
+          shift
+          continue
+        fi
+        break
         ;;
     esac
   done
diff --git a/plugins/builder-nixpacks/builder-build b/plugins/builder-nixpacks/builder-build
index 7a5a5fc08..d74d9ba3a 100755
--- a/plugins/builder-nixpacks/builder-build
+++ b/plugins/builder-nixpacks/builder-build
@@ -232,8 +232,11 @@ trigger-builder-nixpacks-builder-build() {
         shift 1
         ;;
       *)
-        shift
-        continue
+        if [[ -n "$1" ]]; then
+          shift
+          continue
+        fi
+        break
         ;;
     esac
   done
diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build
index 338d8144b..305d21514 100755
--- a/plugins/builder-pack/builder-build
+++ b/plugins/builder-pack/builder-build
@@ -270,8 +270,11 @@ trigger-builder-pack-builder-build() {
         shift 1
         ;;
       *)
-        shift
-        continue
+        if [[ -n "$1" ]]; then
+          shift
+          continue
+        fi
+        break
         ;;
     esac
   done
diff --git a/plugins/builder-railpack/builder-build b/plugins/builder-railpack/builder-build
index 133de71db..3b7e7e6df 100755
--- a/plugins/builder-railpack/builder-build
+++ b/plugins/builder-railpack/builder-build
@@ -114,8 +114,11 @@ trigger-builder-railpack-builder-build() {
         shift 1
         ;;
       *)
-        shift
-        continue
+        if [[ -n "$1" ]]; then
+          shift
+          continue
+        fi
+        break
         ;;
     esac
   done