diff --git a/zebra/zebra_neigh.c b/zebra/zebra_neigh.c
index 2fca2a0615..09e9a62f68 100644
--- a/zebra/zebra_neigh.c
+++ b/zebra/zebra_neigh.c
@@ -272,8 +272,13 @@ void zebra_neigh_init(void)
 
 void zebra_neigh_terminate(void)
 {
+	struct zebra_neigh_ent *n, *next;
+
 	if (!zrouter.neigh_info)
 		return;
 
+	RB_FOREACH_SAFE (n, zebra_neigh_rb_head, &zneigh_info->neigh_rb_tree,
+			 next)
+		zebra_neigh_free(n);
 	XFREE(MTYPE_ZNEIGH_INFO, zneigh_info);
 }