diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index ee1e37f02f..af5b81d446 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2384,6 +2384,10 @@ syncrepl_del_nonpresent(
 			ber_bvfree( np_prev->npe_name );
 			ber_bvfree( np_prev->npe_nname );
 			ch_free( np_prev );
+
+			if ( slapd_shutdown ) {
+				break;
+			}
 		}
 
 		slap_graduate_commit_csn( op );