diff --git a/src/mpid/ch4/netmod/ofi/ofi_gpu_pipeline.c b/src/mpid/ch4/netmod/ofi/ofi_gpu_pipeline.c
index 02def785b2d..a5e0d00db76 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_gpu_pipeline.c
+++ b/src/mpid/ch4/netmod/ofi/ofi_gpu_pipeline.c
@@ -325,35 +325,39 @@ static int start_recv_chunk(MPIR_Request * rreq, int n_chunks)
 
 static int recv_chunk_alloc_poll(MPIR_Async_thing * thing)
 {
+    int ret = MPIR_ASYNC_THING_NOPROGRESS;
     struct recv_chunk_alloc *p = MPIR_Async_thing_get_state(thing);
     MPIR_Request *rreq = p->rreq;
 
-    /* arbitrary threshold */
-    if (MPIDI_OFI_REQUEST(rreq, pipeline_info.recv.num_inrecv) > 1) {
-        return MPIR_ASYNC_THING_NOPROGRESS;
-    }
+    while (true) {
+        bool ret = issue_recv_alloc(rreq, false /* is_init */);
+        if (!ret) {
+            goto fn_exit;
+        }
 
-    bool ret = issue_recv_alloc(rreq, false /* is_init */);
-    if (ret) {
         p->issued_chunks++;
         if (p->issued_chunks == p->n_chunks) {
             MPL_free(p);
-            return MPIR_ASYNC_THING_DONE;
+            ret = MPIR_ASYNC_THING_DONE;
+            goto fn_exit;
         } else {
-            return MPIR_ASYNC_THING_UPDATED;
+            ret = MPIR_ASYNC_THING_UPDATED;
         }
     }
 
-    return MPIR_ASYNC_THING_NOPROGRESS;
+  fn_exit:
+    return ret;
 }
 
 /* ---- */
 static bool issue_recv_alloc(MPIR_Request * rreq, bool is_init)
 {
+    bool ret;
     void *host_buf;
     MPIDU_genq_private_pool_alloc_cell(MPIDI_OFI_global.gpu_pipeline_recv_pool, &host_buf);
     if (!host_buf) {
-        return MPIR_ASYNC_THING_NOPROGRESS;
+        ret = false;
+        goto fn_exit;
     }
 
     fi_addr_t remote_addr = MPIDI_OFI_REQUEST(rreq, pipeline_info.recv.remote_addr);
@@ -385,15 +389,19 @@ static bool issue_recv_alloc(MPIR_Request * rreq, bool is_init)
     if (ret == 0) {
         MPIDI_OFI_REQUEST(rreq, pipeline_info.recv.num_inrecv) += 1;
         /* chunk_req and host_buf will be freed in recv_events */
-        return true;
+        ret = true;
+        goto fn_exit;
     }
     if (ret != -FI_EAGAIN && ret != -FI_ENOMEM) {
         /* unexpected error */
         MPIR_Assert(0);
     }
+    ret = false;
     MPIDU_genq_private_pool_free_cell(MPIDI_OFI_global.gpu_pipeline_recv_pool, host_buf);
     MPL_free(chunk_req);
-    return false;
+
+  fn_exit:
+    return ret;
 };
 
 /* ------------------------------------