diff --git a/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2 b/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
index 484efeba5850..e1bba383bcf2 100644
--- a/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
+++ b/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
@@ -10,6 +10,8 @@ vni {{ vnet_metadata['vni'] }}
 {% endblock vrf %}
 !
 {% block interfaces %}
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 {% for (name, prefix) in INTERFACE|pfx_filter %}
 interface {{ name }}
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 b1596909c788..fa9d272eb217 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
@@ -15,6 +15,8 @@ log facility local4
 ! end of template: common/daemons.common.conf.j2!
 agentx
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf
index 919c35085b5c..d9d585b99b4c 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf
@@ -1,4 +1,7 @@
 !
+!
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
index f7b30f214d4d..ac2d8dac88f2 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
@@ -20,6 +20,8 @@ vni 10
 vrf Second
 vni 20
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect
diff --git a/src/sonic-config-engine/tests/sample_output/frr.conf b/src/sonic-config-engine/tests/sample_output/frr.conf
index 6e8573e9ba9d..374b3bf5f043 100644
--- a/src/sonic-config-engine/tests/sample_output/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/frr.conf
@@ -18,6 +18,8 @@ agentx
 !
 !
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel01
 link-detect
diff --git a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
index 312394bf76c9..be261bab99a8 100644
--- a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
@@ -12,6 +12,8 @@ vrf VnetFE
 vni 8000
 !
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel0
 link-detect
diff --git a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-vni-zebra.conf b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-vni-zebra.conf
index 180a0e9fab89..7b7987650d61 100644
--- a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-vni-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-vni-zebra.conf
@@ -19,6 +19,8 @@ vrf VnetFE
 vni 9000
 !
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect
diff --git a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-zebra.conf b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-zebra.conf
index 661b27268255..fc8a8a2fb3bf 100644
--- a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-zebra.conf
@@ -19,6 +19,8 @@ vrf VnetFE
 vni 8000
 !
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect
diff --git a/src/sonic-config-engine/tests/sample_output/zebra_frr.conf b/src/sonic-config-engine/tests/sample_output/zebra_frr.conf
index e3d0c2d55bc3..f596c5579d3b 100644
--- a/src/sonic-config-engine/tests/sample_output/zebra_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/zebra_frr.conf
@@ -16,6 +16,8 @@ log facility local4
 ! end of template: common/daemons.common.conf.j2!
 !
 !
+! Enable nht through default route
+ip nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel01
 link-detect