diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index cf0b0f0077..451080584d 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -52,6 +52,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
 {% endif %}
 !
 {# set router-id #}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index e2f9964766..221daa0008 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -47,6 +47,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index c7f2971fd7..843ea9b7b7 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -29,6 +29,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 431499ceaf..8b04c4a9a7 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -29,6 +29,7 @@ router bgp 55555
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index a43da1beed..b107982204 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -66,6 +66,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
index 4245076ad9..2c146698a9 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -50,6 +50,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
index ce4f4d7ce2..702f588cab 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
index dcdcc78af0..3296bed6e6 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
index 259415e89e..7d985db93b 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -69,6 +69,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
index 7633ac117b..d3b9b472c5 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
@@ -66,6 +66,7 @@ router bgp 4000
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
index b8a7f25682..e7534d4b97 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -50,6 +50,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index ce4f4d7ce2..702f588cab 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index dcdcc78af0..3296bed6e6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
index 02173159ae..43bed33c4b 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -69,6 +69,7 @@ router bgp 65100
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
index 7633ac117b..d3b9b472c5 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -66,6 +66,7 @@ router bgp 4000
   bgp graceful-restart restart-time 240
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 4.0.0.0
 !