diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 0560dc46f9..109c98f81c 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -45,6 +45,7 @@
 #include "bgpd/bgp_encap_types.h"
 #include "bgpd/bgp_debug.h"
 #include "bgpd/bgp_aspath.h"
+#include "bgpd/bgp_zebra.h"
 
 /*
  * Definitions and external declarations.
@@ -2725,6 +2726,10 @@ int bgp_evpn_local_vni_add(struct bgp *bgp, vni_t vni,
 	 */
 	install_routes_for_vni(bgp, vpn);
 
+	/* If we are advertising gateway mac-ip
+	   It needs to be conveyed again to zebra */
+	bgp_zebra_advertise_gw_macip(bgp, vpn->advertise_gw_macip, vpn->vni);
+
 	return 0;
 }