diff --git a/gso/utils/workflow_steps.py b/gso/utils/workflow_steps.py
index fb166950d5cf821390b34dd04b0264deb3a54acb..2095e7621a51038c95cf8ba18f4ade74961f8b19 100644
--- a/gso/utils/workflow_steps.py
+++ b/gso/utils/workflow_steps.py
@@ -93,6 +93,13 @@ def _update_sdp_single_pe(
         )["all"]["hosts"],
     }
 
+    if not extra_vars["pe_router_list"]:
+        return {
+            "playbook_name": "",
+            "inventory": {"all": {"hosts": {}}},
+            "extra_vars": {},
+        }
+
     return {
         "playbook_name": "update_pe_sdp_mesh.yaml",
         "inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}},
@@ -118,6 +125,13 @@ def _add_pe_mesh_to_pe(
         )["all"]["hosts"],
     }
 
+    if not extra_vars["pe_router_list"]:
+        return {
+            "playbook_name": "",
+            "inventory": {"all": {"hosts": {}}},
+            "extra_vars": {},
+        }
+
     return {
         "playbook_name": "update_ibgp_mesh.yaml",
         "inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}},
@@ -167,6 +181,13 @@ def _add_all_p_to_pe(
         )["all"]["hosts"],
     }
 
+    if not extra_vars["p_router_list"]:
+        return {
+            "playbook_name": "",
+            "inventory": {"all": {"hosts": {}}},
+            "extra_vars": {},
+        }
+
     return {
         "playbook_name": "update_ibgp_mesh.yaml",
         "inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}},