diff --git a/stackstorm.yml b/stackstorm.yml
index ee3a7d68..0da7a720 100644
--- a/stackstorm.yml
+++ b/stackstorm.yml
@@ -14,6 +14,6 @@
     - StackStorm.st2chatops
     - StackStorm.st2smoketests
     - role: StackStorm.ewc
-      when: ewc_license is defined and ewc_license | length > 0
+      when: ewc_license is defined and ewc_license is not none and ewc_license | length > 0
     - role: StackStorm.ewc_smoketests
-      when: ewc_license is defined and ewc_license | length > 0
+      when: ewc_license is defined and ewc_license is not none and ewc_license | length > 0