diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 51b4f23151..90b0516276 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -3231,6 +3231,9 @@ static int zl3vni_nh_install(zebra_l3vni_t *zl3vni,
 static int zl3vni_nh_uninstall(zebra_l3vni_t *zl3vni,
 			       zebra_neigh_t *n)
 {
+	if (!is_l3vni_oper_up(zl3vni))
+		return -1;
+
 	if (!(n->flags & ZEBRA_NEIGH_REMOTE) ||
 	    !(n->flags & ZEBRA_NEIGH_REMOTE_NH))
 		return 0;