diff --git a/packages/cli/src/build/request.rs b/packages/cli/src/build/request.rs
index cf89056da..e062d3060 100644
--- a/packages/cli/src/build/request.rs
+++ b/packages/cli/src/build/request.rs
@@ -2254,8 +2254,7 @@ impl BuildRequest {
         }
 
         // We want to go through wasm-ld directly, so we need to remove the -flavor flag
-        if self.is_wasm_or_wasi() {
-            let flavor_idx = args.iter().position(|arg| *arg == "-flavor").unwrap();
+        if let Some(flavor_idx) = args.iter().position(|arg| *arg == "-flavor") {
             args.remove(flavor_idx + 1);
             args.remove(flavor_idx);
         }