diff --git a/kipina-codebench/benchmark.mjs b/kipina-codebench/benchmark.mjs
index ef451dc..712a7c5 100644
--- a/kipina-codebench/benchmark.mjs
+++ b/kipina-codebench/benchmark.mjs
@@ -489,7 +489,9 @@ async function main() {
 
     console.log(`Mallit (${models.length}): ${models.join(', ')}`);
 
-    const scenarios = SCENARIO_FILTER === 'all' ? SCENARIOS : [SCENARIOS[0]];
+    const scenarios = SCENARIO_FILTER === 'all' ? SCENARIOS :
+        SCENARIOS.filter(s => s.id === SCENARIO_FILTER).length > 0 ? SCENARIOS.filter(s => s.id === SCENARIO_FILTER) :
+        [SCENARIOS[0]];
     console.log(`Skenaariot (${scenarios.length}): ${scenarios.map(s => s.id).join(', ')}`);
     if (ROUNDS > 1) console.log(`Toistoja: ${ROUNDS}`);
     console.log(`Tulokset: ${OUTPUT_DIR}/`);