diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index eea78eb..a35e5da 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -181,10 +181,11 @@ jobs:
               MODE="^"
             fi
           fi
-          if [[ -n "${{ inputs.environment }}" ]]; then
+          if [[ "${{ inputs.target-machine }}" == "evm" ]] && [[ -n "${{ inputs.environment }}" ]]; then
             ENVIRONMENT="--environment ${{ inputs.environment }}"
           fi
 
+          # Set mode to Y+ for evm ir-llvm due to hanging issues
           if [[ "${{ inputs.target-machine }}" == "evm" ]] && [[ "${{ inputs.toolchain }}" == "ir-llvm" ]]; then
             MODE="Y+M^B3"
           fi