diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 07683e7d3d..5c2e1c9212 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -266,7 +266,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, pre_deploy_step_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, pre_deploy_step_tasks]
+              - []
         {%- endfor %}
 
   ExternalDeployTasks:
@@ -276,7 +279,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_deploy_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_deploy_tasks]
+              - []
         {%- endfor %}
 
   ExternalPostDeployTasks:
@@ -286,7 +292,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_post_deploy_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_post_deploy_tasks]
+              - []
         {%- endfor %}
 
   ScaleTasks:
@@ -306,7 +315,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_update_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_update_tasks]
+              - []
         {%- endfor %}
 
   ExternalUpgradeTasks:
@@ -316,7 +328,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_upgrade_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_upgrade_tasks]
+              - []
         {%- endfor %}
 
   BootstrapServerId: