diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 7496dc42f6..5ee2f1d934 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -122,6 +122,8 @@ slap_init( int mode, const char *name )
 
 	switch ( slapMode & SLAP_MODE ) {
 	case SLAP_SERVER_MODE:
+		ldap_pvt_thread_pool_init( &connection_pool,
+				connection_pool_max, 0);
 
 		/* FALLTHRU */
 	case SLAP_TOOL_MODE:
@@ -132,9 +134,6 @@ slap_init( int mode, const char *name )
 
 		slap_name = name;
 
-		ldap_pvt_thread_pool_init( &connection_pool,
-				connection_pool_max, 0);
-
 		ldap_pvt_thread_mutex_init( &entry2str_mutex );
 		ldap_pvt_thread_mutex_init( &replog_mutex );