diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml
index 65e6ba290..aefc3c80f 100644
--- a/roles/network_plugin/tasks/calico.yml
+++ b/roles/network_plugin/tasks/calico.yml
@@ -38,9 +38,9 @@
 
 - name: Calico | Disable node mesh
   shell: calicoctl bgp node-mesh off
-  when: peer_with_router is defined and peer_with_router and inventory_hostname in groups['kube-node']
+  when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
 
 - name: Calico | Configure peering with router(s)
   shell: calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}
   with_items: peers
-  when: peer_with_router and inventory_hostname in groups['kube-node']
+  when: peer_with_router|default(false) and inventory_hostname in groups['kube-node']
diff --git a/roles/network_plugin/templates/calico/calico-node.service.j2 b/roles/network_plugin/templates/calico/calico-node.service.j2
index fe44d0f5e..dc03d5213 100644
--- a/roles/network_plugin/templates/calico/calico-node.service.j2
+++ b/roles/network_plugin/templates/calico/calico-node.service.j2
@@ -8,7 +8,7 @@ User=root
 PermissionsStartOnly=true
 ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
 {% if inventory_hostname in groups['kube-node'] %}
-{%    if peer_with_router %}
+{%    if peer_with_router|default(false) %}
 ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
 {%     else %}
 ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes