diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index dbc39c376f..6b03416dc2 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -2460,9 +2460,9 @@ void slapi_valueset_free(Slapi_ValueSet *vs)
 		BerVarray vp = *vs;
 
 		ber_bvarray_free( vp );
-		slapi_ch_free( (void **)&vp );
+		vp = NULL;
 
-		*vs = NULL;
+		slapi_ch_free( (void **)&vp );
 	}
 }