diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 5f6496821fb028b9106dc591613708a1c2e10466..3fe81157b79552017523151a9b107583eb7aa14d 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2620,7 +2620,6 @@ slapd_daemon( void )
 {
 	int rc;
 
-	connections_init();
 #ifdef LDAP_CONNECTIONLESS
 	connectionless_init();
 #endif /* LDAP_CONNECTIONLESS */
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 70dae327d6acd11958a37885239f7a83e42a09c2..5f841086c43acaee59bb80cc50dd4bbbf2b1d803 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -929,6 +929,8 @@ unhandled_option:;
 	 */
 	time( &starttime );
 
+	connections_init();
+
 	if ( slap_startup( NULL ) != 0 ) {
 		rc = 1;
 		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );