diff --git a/oshmem/shmem/c/shmem_lock.c b/oshmem/shmem/c/shmem_lock.c
index 3d167b61d5..dc469461ac 100644
--- a/oshmem/shmem/c/shmem_lock.c
+++ b/oshmem/shmem/c/shmem_lock.c
@@ -270,7 +270,11 @@ static uint64_t shmem_lock_cswap(void *target,
 
         prev_value = prev_value_32;
     }
-
+    /* function is used to busy wait for the value. 
+     * Call opal_progress() so that ompi will no deadlock
+     * (for example may need to respond to rkey requests)
+     */
+    opal_progress();
     return prev_value;
 }