diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 662c6338..5558bf4b 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -741,7 +741,7 @@ spec:
                 log.info("Pipeline", "Executing generated stages for ${component.name}...")
                 generateComponentStages(component, configurations)()
               }
-            } else if {
+            } else if (env.changedComponents != null && env.changedComponents.split(/\s+/).toList().size() > 0) {
               def changedComponents = env.changedComponents.split(/\s+/).toList()
               configurations.components.each { component ->
                 if (changedComponents.contains(component.name)) {