diff --git a/src/mca/pls/rsh/pls_rsh_component.c b/src/mca/pls/rsh/pls_rsh_component.c
index 56414a8f5f..a8fb3e00a3 100644
--- a/src/mca/pls/rsh/pls_rsh_component.c
+++ b/src/mca/pls/rsh/pls_rsh_component.c
@@ -177,9 +177,6 @@ int orte_pls_rsh_component_close(void)
         OMPI_THREAD_UNLOCK(&mca_pls_rsh_component.lock);
     }
 
-    /* cleanup any pending recvs */
-    orte_rml.recv_cancel(ORTE_RML_NAME_ANY, ORTE_RML_TAG_RMGR_CLNT);
-
     /* cleanup state */
     OBJ_DESTRUCT(&mca_pls_rsh_component.lock);
     OBJ_DESTRUCT(&mca_pls_rsh_component.cond);
diff --git a/src/mca/pls/rsh/pls_rsh_module.c b/src/mca/pls/rsh/pls_rsh_module.c
index 303e648866..eff616987a 100644
--- a/src/mca/pls/rsh/pls_rsh_module.c
+++ b/src/mca/pls/rsh/pls_rsh_module.c
@@ -538,7 +538,9 @@ int orte_pls_rsh_terminate_proc(const orte_process_name_t* proc)
 
 int orte_pls_rsh_finalize(void)
 {
-    return ORTE_ERR_NOT_IMPLEMENTED;
+    /* cleanup any pending recvs */
+    orte_rml.recv_cancel(ORTE_RML_NAME_ANY, ORTE_RML_TAG_RMGR_CLNT);
+    return ORTE_SUCCESS;
 }