diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index a17311da9d088250ff70c6171d98868b4c5e353a..298381c291a80ef9ea3342faffdd55de662147f8 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1228,7 +1228,9 @@ _slurmd_init(void)
 
 	/*
 	 * Get and set slurmd topology information
+	 * Build node hash table first to speed up the topo build
 	 */
+	rehash_node();
 	slurm_topo_build_config();
 	_set_topo_info();