diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 56c3a211be..43652d32c9 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1628,7 +1628,10 @@ static int parseValuesReturnFilter (
 		} else {
 			send_ldap_result( op, rs );
 		}
-		if( op->o_vrFilter != NULL) vrFilter_free( op, op->o_vrFilter ); 
+		if( op->o_vrFilter != NULL) {
+			vrFilter_free( op, op->o_vrFilter );
+			op->o_vrFilter = NULL;
+		}
 	}
 #ifdef LDAP_DEBUG
 	else {