diff --git a/opal/util/keyval_parse.c b/opal/util/keyval_parse.c
index 8285d68118..18043a2ccb 100644
--- a/opal/util/keyval_parse.c
+++ b/opal/util/keyval_parse.c
@@ -55,6 +55,8 @@ int
 opal_util_keyval_parse_finalize(void)
 {
     if (NULL != key_buffer) free(key_buffer);
+    key_buffer = NULL;
+    key_buffer_len = 0;
 
     OBJ_DESTRUCT(&keyval_mutex);