diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c
index d5e043eea8..4006e1fed5 100644
--- a/zebra/zebra_evpn.c
+++ b/zebra/zebra_evpn.c
@@ -1423,8 +1423,24 @@ void zebra_evpn_rem_macip_add(vni_t vni, const struct ethaddr *macaddr,
 	 * REMOTE - if ES is not local
 	 */
 	if (flags & ZEBRA_MACIP_TYPE_SYNC_PATH) {
-		zebra_evpn_process_sync_macip_add(zevpn, macaddr, ipa_len,
-						  ipaddr, flags, seq, esi);
+		struct zebra_evpn_es *es;
+
+		es = zebra_evpn_es_find(esi);
+		if (es && (es->flags & ZEBRA_EVPNES_READY_FOR_BGP)) {
+			zebra_evpn_process_sync_macip_add(zevpn, macaddr,
+							  ipa_len, ipaddr,
+							  flags, seq, esi);
+		} else {
+			if (IS_ZEBRA_DEBUG_EVPN_MH_ES) {
+				char esi_str[ESI_STR_LEN];
+
+				esi_to_str(esi, esi_str, sizeof(esi_str));
+				zlog_debug(
+					"Ignore sync-macip add; ES %s is not ready",
+					esi_str);
+			}
+		}
+
 		return;
 	}