diff --git a/tasks/providers/setup_ovs_ovn.yml b/tasks/providers/setup_ovs_ovn.yml
index 2302fee7..7dbc4519 100644
--- a/tasks/providers/setup_ovs_ovn.yml
+++ b/tasks/providers/setup_ovs_ovn.yml
@@ -62,7 +62,7 @@
     loop_var: bridge_mapping
   when:
     - neutron_services['neutron-ovn-controller']['group'] in group_names
-    - neutron_provider_networks.network_mappings is defined
+    - neutron_provider_networks.network_mappings is defined and (neutron_provider_networks.network_mappings|length > 0)
 
 - name: Add ports to Network Provider Bridges
   openvswitch_port:
@@ -79,7 +79,7 @@
 - name: Set the OVN Bridge Mappings in OVS
   command: "ovs-vsctl set open . external-ids:ovn-bridge-mappings={{ neutron_provider_networks.network_mappings }}"
   when:
-    - neutron_provider_networks.network_mappings is defined
+    - neutron_provider_networks.network_mappings is defined and (neutron_provider_networks.network_mappings|length > 0)
     - neutron_services['neutron-ovn-controller']['group'] in group_names
 
 - include_tasks: ovn_cluster_setup.yml