diff --git a/src/client/api/init.c b/src/client/api/init.c
index 26fb68ea2d0..4c6ab9dd186 100644
--- a/src/client/api/init.c
+++ b/src/client/api/init.c
@@ -334,6 +334,8 @@ daos_fini(void)
 		D_GOTO(unlock, rc);
 	}
 
+	daos_hhash_fini();
+
 	/** clean up all registered per-module metrics */
 	daos_metrics_fini();
 #if BUILD_PIPELINE
@@ -354,7 +356,6 @@ daos_fini(void)
 	dc_job_fini();
 
 	pl_fini();
-	daos_hhash_fini();
 	daos_debug_fini();
 	module_initialized = 0;
 unlock: