diff --git a/CHANGES b/CHANGES
index 2e59820723532f4a1da54a2900328a995cac620c..74c9ead82c4750da9a770b593eeb5e5663c959f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@ OpenLDAP 2.4.14 Engineering
 	Fixed slapo-memberof multiple instantiation (ITS#5903)
 	Fixed slapo-pcache filter sorting (ITS#5756)
 	Fixed slapo-ppolicy to not be global (ITS#5858)
+	Fixed slapo-rwm double free (ITS#5923)
 	Fixed slapo-rwm with back-config (ITS#5906)
 	Added slapo-rwm newRDN rewriting (ITS#5834)
 	Updated contrib/addpartial module (ITS#5764)
diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index 052348ade7b3822dfd3a1d5aeb30f18411bee73e..67655c3068e95187125da1c7d33e56faccf48eaf 100644
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -1187,7 +1187,7 @@ rwm_dnattr_result_rewrite(
 	last--;
 
 	for ( i = 0; !BER_BVISNULL( &a_vals[i] ); i++ ) {
-		struct berval	pdn, ndn;
+		struct berval	pdn, ndn = BER_BVNULL;
 		int		rc;
 		
 		pdn = a_vals[i];