1 files changed, 4 insertions, 3 deletions
diff --git a/zebra/main.c b/zebra/main.c
index 46cf2eea7d..e38f9a85e3 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -221,14 +221,15 @@ void zebra_finalize(struct thread *dummy)
 {
 	zlog_info("Zebra final shutdown");
 
-	/* Final shutdown of ns resources */
-	ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
-
 	/* Stop dplane thread and finish any cleanup */
 	zebra_dplane_shutdown();
 
+	/* Final shutdown of ns resources */
+	ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
+
 	zebra_router_terminate();
 
+	ns_terminate();
 	frr_fini();
 	exit(0);
 }