diff --git a/roles/network_plugin/calico/rr/tasks/main.yml b/roles/network_plugin/calico/rr/tasks/main.yml
index 7b558d2fc..2f4c00d31 100644
--- a/roles/network_plugin/calico/rr/tasks/main.yml
+++ b/roles/network_plugin/calico/rr/tasks/main.yml
@@ -83,7 +83,7 @@
      }'
   delegate_to: "{{groups['etcd'][0]}}"
   with_items: calico_ospf_peers
-  when: calico_ospf_peers|length > 0
+  when: (calico_ospf_peers is defined and calico_ospf_peers|length > 0)
 
 - meta: flush_handlers