diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 844f3e76..8cbf9cce 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -85,13 +85,13 @@ spec:
       }
 
       stage("Code Changes Detection") {
-        steps {
-          when {
-            expression {
-              return env.executeMode == "on-demand"
-            }
+        when {
+          expression {
+            return env.executeMode == "on-demand"
           }
+        }
 
+        steps {
           script {
             sourceFetcher.fetch(configurations)