diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 3375133279..c20bb4bbd6 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -113,8 +113,6 @@ slap_init( int mode, const char *name )
 
 		slap_name = name;
 
-		(void) ldap_pvt_thread_initialize();
-
 		ldap_pvt_thread_pool_init( &connection_pool,
 				connection_pool_max, 0);
 
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 864463d9c0..01fbf316af 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -501,6 +501,8 @@ unhandled_option:;
 		}
 	}
 
+	(void) ldap_pvt_thread_initialize();
+
 	lutil_set_debug_level( "slapd", slap_debug );
 	ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
 	ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);