diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 566fd63262..f4dba0124b 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -707,6 +707,8 @@ int entry_decode(struct berval *bv, Entry **e)
 					return rc;
 				}
 			}
+			a->a_nvals[j].bv_val = NULL;
+			a->a_nvals[j].bv_len = 0;
 		}
 #endif