diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 688e7266072a9472527b4fabc9687f214cf2672b..76e470efe63a388c122593fdc3266596b609ae4b 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -523,8 +523,6 @@ int get_ctrls(
 
 			c->ldctl_iscritical = (crit != 0);
 			tag = ber_peek_tag( ber, &len );
-		} else {
-			c->ldctl_iscritical = 0;
 		}
 
 		if( tag == LBER_OCTETSTRING ) {
@@ -541,8 +539,6 @@ int get_ctrls(
 				rs->sr_text = "decoding controls error";
 				goto return_results;
 			}
-		} else {
-			BER_BVZERO( &c->ldctl_value );
 		}
 
 		Debug( LDAP_DEBUG_TRACE,