diff --git a/zebra/table_manager.c b/zebra/table_manager.c
index 9f3b44f944..82d6a0a6a2 100644
--- a/zebra/table_manager.c
+++ b/zebra/table_manager.c
@@ -82,7 +82,6 @@ void table_manager_enable(struct zebra_vrf *zvrf)
 	zvrf->tbl_mgr = XCALLOC(MTYPE_TM_TABLE, sizeof(struct table_manager));
 	zvrf->tbl_mgr->lc_list = list_new();
 	zvrf->tbl_mgr->lc_list->del = delete_table_chunk;
-	hook_register(zserv_client_close, release_daemon_table_chunks);
 }
 
 /**
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index d051ed67a0..66d6d4b4f2 100644
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -705,6 +705,8 @@ void zebra_vrf_init(void)
 	vrf_init(zebra_vrf_new, zebra_vrf_enable, zebra_vrf_disable,
 		 zebra_vrf_delete, zebra_vrf_update);
 
+	hook_register(zserv_client_close, release_daemon_table_chunks);
+
 	vrf_cmd_init(vrf_config_write);
 
 	if (vrf_is_backend_netns() && ns_have_netns()) {