diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index a3f70d585c..9447048706 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -9744,6 +9744,21 @@ stream_failure:
 	return;
 }
 
+static int macfdb_read_zns(struct zebra_ns *zns,
+			     void *_in_param __attribute__((unused)),
+			     void **out_param __attribute__((unused)))
+{
+	macfdb_read(zns);
+	return ZNS_WALK_CONTINUE;
+}
+
+static int neigh_read_zns(struct zebra_ns *zns,
+			  void *_in_param __attribute__((unused)),
+			  void **out_param __attribute__((unused)))
+{
+	neigh_read(zns);
+	return ZNS_WALK_CONTINUE;
+}
 
 /*
  * Handle message from client to learn (or stop learning) about VNIs and MACs.
@@ -9793,10 +9808,10 @@ void zebra_vxlan_advertise_all_vni(ZAPI_HANDLER_ARGS)
 			     NULL);
 
 		/* Read the MAC FDB */
-		macfdb_read(zvrf->zns);
+		zebra_ns_list_walk(macfdb_read_zns, NULL, NULL);
 
 		/* Read neighbors */
-		neigh_read(zvrf->zns);
+		zebra_ns_list_walk(neigh_read_zns, NULL, NULL);
 	} else {
 		/* Cleanup VTEPs for all VNIs - uninstall from
 		 * kernel and free entries.