diff --git a/CHANGES b/CHANGES
index 10b114ec2ccc4a24f6d6f6391680105887ec57f4..af64dc9ee7419904fe516048ecc669eed974aa75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapd modify leaving rc uninitialized (ITS#6715)
 	Fixed slapd syncrepl reuse of presence list (ITS#6707)
 	Fixed slapd-bdb entry cache delete failure (ITS#6577)
+	Fixed slapd-ldap uninitialized tv_usec (ITS#6721)
 	Fixed slapd-ndb to honor rootpw setting (ITS#6661)
 	Fixed slapd-meta anon retry with failed auth method (ITS#6643)
 	Fixed slapd-meta rebind proc (ITS#6665)
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 7b5cb291f134f8768501112831a71a001dc7e5f2..b658524a3e4a993ad9f96cd6d9a9c2bf8987f5f7 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -2339,8 +2339,7 @@ retry:
 		rs->sr_err = ldap_whoami( lc->lc_ld, ctrls, NULL, &msgid );
 		if ( rs->sr_err == LDAP_SUCCESS ) {
 			/* by now, make sure no timeout is used (ITS#6282) */
-			struct timeval tv;
-			tv.tv_sec = -1;
+			struct timeval tv = { -1, 0 };
 			if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
 				ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER,
 					&rs->sr_err );
diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 293e24e0a8aae1b54649b656a72dc479d2eedece..12570e72d5e39a57142c225ec4c3a8b51435c466 100644
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -191,8 +191,7 @@ retry:
 	if ( rc == LDAP_SUCCESS ) {
 		/* TODO: set timeout? */
 		/* by now, make sure no timeout is used (ITS#6282) */
-		struct timeval tv;
-		tv.tv_sec = -1;
+		struct timeval tv = { -1, 0 };
 		if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
 			ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
 			rs->sr_err = rc;
@@ -320,8 +319,7 @@ retry:
 	if ( rc == LDAP_SUCCESS ) {
 		/* TODO: set timeout? */
 		/* by now, make sure no timeout is used (ITS#6282) */
-		struct timeval tv;
-		tv.tv_sec = -1;
+		struct timeval tv = { -1, 0 };
 		if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
 			ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
 			rs->sr_err = rc;