diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/dynamic/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/dynamic/instance.conf.j2
index 5082b75005c2..83ce6545b8c9 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/dynamic/instance.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/dynamic/instance.conf.j2
@@ -12,7 +12,7 @@
 !
 {% if bgp_session['peer_asn'] is defined %}
   neighbor {{ bgp_session['name'] }} remote-as {{ bgp_session['peer_asn'] }}
-{% else %}
+{% elif CONFIG_DB__DEVICE_METADATA['localhost']['deployment_id'] in constants.deployment_id_asn_map %}
   neighbor {{ bgp_session['name'] }} remote-as {{ constants.deployment_id_asn_map[CONFIG_DB__DEVICE_METADATA['localhost']['deployment_id']] }}
 {% endif %}
 !