diff --git a/CHANGES b/CHANGES
index c613cddfde6758f790e9dae8be07a365330432eb..b8b820d7e9dc204d6c2768288e574aa2c6b8543a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,7 @@ OpenLDAP 2.4.17 Engineering
 	Fixed slapd-hdb dncache lockups (ITS#6095)
 	Fixed slapd-relay to return failure on failure (ITS#5328)
 	Fixed slapd-sql with BACKSQL_ARBITRARY_KEY defined (ITS#6100)
+	Fixed slapo-dds entry expiration (ITS#6169)
 	Fixed slapo-refint refint_repair handling (ITS#6056)
 	Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057)
 	Fixed slapo-rwm dn passing (ITS#6070)
diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 561062d578ab49b8bf35f39a53c12a0f7341b905..fda9d70edb4dc4a7a38727bb6713b357a95a55af 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -243,10 +243,9 @@ done_search:;
 					de->de_ndn.bv_val, rs.sr_err );
 				break;
 			}
-	
+
 			if ( de != NULL ) {
 				*dep = de->de_next;
-				dep = &de->de_next;
 				op->o_tmpfree( de, op->o_tmpmemctx );
 			}
 		}