diff --git a/servers/slapd/overlays/rwmdn.c b/servers/slapd/overlays/rwmdn.c
index 5cdf0522ee..18c73ec409 100644
--- a/servers/slapd/overlays/rwmdn.c
+++ b/servers/slapd/overlays/rwmdn.c
@@ -202,6 +202,10 @@ rwm_dn_massage(
 		BER_BVZERO( &mdn );
 	}
 
+	if ( dn->bv_val == dmy ) {
+		BER_BVZERO( dn );
+	}
+
 	return rc;
 }