diff --git a/data/host/sk1/edge1/bgp.yaml b/data/host/sk1/edge1/bgp.yaml
index 9848ce4..9343f86 100644
--- a/data/host/sk1/edge1/bgp.yaml
+++ b/data/host/sk1/edge1/bgp.yaml
@@ -23,3 +23,4 @@ peers:
         - 192.145.251.168
         - 192.145.251.169
       authentication: "..."
+      irr: AS-GOOGLE
diff --git a/templates/iosxr/edge-bgp.j2 b/templates/iosxr/edge-bgp.j2
index ec10349..9b70539 100644
--- a/templates/iosxr/edge-bgp.j2
+++ b/templates/iosxr/edge-bgp.j2
@@ -254,6 +254,8 @@ end-policy
 {% endfor %}
 {% endfor %}
 
+{% include "iosxr/irr.j2" %}
+
 {% set asn = lookup("bgp", "local-asn") %}
 {% set supernets = lookup("bgp", "supernets") %}
 router static
diff --git a/templates/iosxr/irr.j2 b/templates/iosxr/irr.j2
index 2c44720..8e14564 100644
--- a/templates/iosxr/irr.j2
+++ b/templates/iosxr/irr.j2
@@ -4,8 +4,8 @@
       {% for name, peer in peers.items() if peer.irr is defined %}
         {% set prefix_set_4 = 'PFX-AS{}-IRR-V4'.format(peer.asn | upper) %}
         {% set prefix_set_6 = 'PFX-AS{}-IRR-V6'.format(peer.asn | upper) %}
-{{ bgpq3(prefix_set_4, "-4 -R 24 -m 24", peer.irr) }}
-{{ bgpq3(prefix_set_6, "-6 -R 48 -m 48", peer.irr) }}
+{{ bgpq3(prefix_set_4, "-4 -R 24 -m 24", peer.irr) | replace("no prefix-set {}".format(prefix_set_4), "") }}
+{{ bgpq3(prefix_set_6, "-6 -R 48 -m 48", peer.irr) | replace("no prefix-set {}".format(prefix_set_6), "") }}
       {% endfor %}
     {% endfor %}
   {% endif %}