diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 5898070a62..4e307beccd 100644
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -201,11 +201,11 @@ monitor_subsys_thread_update(
 
 	for ( i = 0; !BER_BVISNULL( &mt[ i ].nrdn ); i++ ) {
 		if ( dn_match( &mt[ i ].nrdn, &rdn ) ) {
-			which = i;
 			break;
 		}
 	}
 
+	which = i;
 	if ( BER_BVISNULL( &mt[ which ].nrdn ) ) {
 		return SLAP_CB_CONTINUE;
 	}