diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index af455b9dce..abd7b6ec80 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -851,7 +851,7 @@ build_new_dn( struct berval * new_dn,
 {
 	char *ptr;
 
-	if ( parent_dn == NULL ) {
+	if ( parent_dn == NULL || parent_dn->bv_len == 0 ) {
 		ber_dupbv( new_dn, newrdn );
 		return;
 	}