diff --git a/opal/mca/pmix/pmix.h b/opal/mca/pmix/pmix.h
index 1b10e5e6ac8..defd77a4391 100644
--- a/opal/mca/pmix/pmix.h
+++ b/opal/mca/pmix/pmix.h
@@ -146,7 +146,7 @@ extern int opal_pmix_base_exchange(opal_value_t *info,
                             OPAL_NAME_PRINT(*(p)), (s)));                                \
         OBJ_CONSTRUCT(&(_ilist), opal_list_t);                                           \
         _info = OBJ_NEW(opal_value_t);                                                   \
-        _info->key = strdup(OPAL_PMIX_IMMEDIATE);                                        \
+        _info->key = strdup(OPAL_PMIX_OPTIONAL);                                         \
         _info->type = OPAL_BOOL;                                                         \
         _info->data.flag = true;                                                         \
         opal_list_append(&(_ilist), &(_info)->super);                                    \
diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c
index e3e2fc81bd6..7729b9bc0fd 100644
--- a/orte/mca/ess/singleton/ess_singleton_module.c
+++ b/orte/mca/ess/singleton/ess_singleton_module.c
@@ -249,7 +249,7 @@ static int rte_init(void)
 
 
     /* get our app number from PMI - ok if not found */
-    OPAL_MODEX_RECV_VALUE(ret, OPAL_PMIX_APPNUM,
+    OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, OPAL_PMIX_APPNUM,
                           ORTE_PROC_MY_NAME, &u32ptr, OPAL_UINT32);
     if (OPAL_SUCCESS == ret) {
         orte_process_info.app_num = u32;