diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index f1d543fce4..1a074ed41c 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -5512,13 +5512,13 @@ syncrepl_config( ConfigArgs *c )
 								ldap_pvt_runqueue_stoptask( &slapd_rq, re );
 								isrunning = 1;
 							}
-							ldap_pvt_runqueue_remove( &slapd_rq, re );
-							ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-
 							if ( ldap_pvt_thread_pool_retract( &connection_pool,
 									re->routine, re ) > 0 )
 								isrunning = 0;
 
+							ldap_pvt_runqueue_remove( &slapd_rq, re );
+							ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+
 							ldap_pvt_thread_mutex_unlock( &si->si_mutex );
 						}
 					}