diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 8dd3a97aa1..7270e37e28 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -103,6 +103,11 @@ static __attribute__((__noreturn__)) void terminate(int i)
 	isis_sr_term();
 	isis_srv6_term();
 	isis_zebra_stop();
+
+	route_map_finish();
+	vrf_terminate();
+
+	frr_fini();
 	exit(i);
 }
 
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index ce4eb74ec6..caf7d3ddfb 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -1628,5 +1628,4 @@ void isis_zebra_stop(void)
 	zclient_free(zclient_sync);
 	zclient_stop(zclient);
 	zclient_free(zclient);
-	frr_fini();
 }