diff --git a/ompi/mca/pml/ucx/pml_ucx.c b/ompi/mca/pml/ucx/pml_ucx.c
index d467f7d6cb34775ba1945f242c0ef68c463dc9b1..14b76b04a7d054ba2453d14d61dbeb5038f4f283 100644
--- a/ompi/mca/pml/ucx/pml_ucx.c
+++ b/ompi/mca/pml/ucx/pml_ucx.c
@@ -427,6 +427,10 @@ static ucp_ep_h mca_pml_ucx_add_proc_common(ompi_proc_t *proc)
     ep_params.field_mask = UCP_EP_PARAM_FIELD_REMOTE_ADDRESS;
     ep_params.address    = address;
 
+    ep_params.field_mask   |= UCP_EP_PARAM_FIELD_PEER_HOST_ADDR;
+    ep_params.vpid          = proc->super.proc_name.vpid;
+    ep_params.peer_hostname = proc->super.proc_hostname;
+
     status = ucp_ep_create(ompi_pml_ucx.ucp_worker, &ep_params, &ep);
     free(address);
     if (UCS_OK != status) {
diff --git a/ompi/mca/pml/ucx/pml_ucx_request.c b/ompi/mca/pml/ucx/pml_ucx_request.c
index 85c64fdd45990bb778b44cea9d6df7f8675d77a6..ef2c01d96009898dffffe4c8d0cf53f5d44e549a 100644
--- a/ompi/mca/pml/ucx/pml_ucx_request.c
+++ b/ompi/mca/pml/ucx/pml_ucx_request.c
@@ -211,7 +211,7 @@ void mca_pml_ucx_request_timeout_warn(uint64_t tag)
     if (rc != OPAL_SUCCESS) {
         peer_hostname = "unknown";
     }
-    PML_UCX_WARN("UCP request timeout! request tag 0x%lX local proc: %u peer proc: %d peer hostname: %s\n",
+    PML_UCX_WARN("UCP recv request timeout! request tag 0x%lX local proc: %u peer proc: %d peer hostname: %s\n",
                   tag, OMPI_PROC_MY_NAME->vpid, rank, peer_hostname);
 }