diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index 3a0df1c015..e3018d5af2 100644
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -417,15 +417,12 @@ void zebra_evpn_es_evi_show_vni(struct vty *vty, bool uj, vni_t vni, int detail)
 			vty_out(vty, "Type: L local, R remote\n");
 			vty_out(vty, "%-8s %-30s %-4s\n", "VNI", "ESI", "Type");
 		}
+		zebra_evpn_es_evi_show_one_evpn(zevpn, vty, json_array, detail);
 	} else {
 		if (!uj)
 			vty_out(vty, "VNI %d doesn't exist\n", vni);
-
-		return;
 	}
 
-	zebra_evpn_es_evi_show_one_evpn(zevpn, vty, json_array, detail);
-
 	if (uj) {
 		vty_out(vty, "%s\n",
 			json_object_to_json_string_ext(