diff --git a/ompi/mca/mtl/ofi/mtl_ofi.h b/ompi/mca/mtl/ofi/mtl_ofi.h
index 6dfb573841..a0105fffdf 100644
--- a/ompi/mca/mtl/ofi/mtl_ofi.h
+++ b/ompi/mca/mtl/ofi/mtl_ofi.h
@@ -307,19 +307,35 @@ ompi_mtl_ofi_send_start(struct mca_mtl_base_module_t *mtl,
                               comm->c_my_rank, tag, 0);
     }
 
-    ret_length = fi_tsend(ompi_mtl_ofi.ep,
-                          start,
-                          length,
-                          ompi_mtl_ofi.mr,
-                          endpoint->peer_fiaddr,
-                          match_bits,
-                          (void *) &ofi_req->ctx);
+    if (ompi_mtl_ofi.max_inject_size >= length) {
+        ret_length = fi_tinject(ompi_mtl_ofi.ep,
+                                start,
+                                length,
+                                endpoint->peer_fiaddr,
+                                match_bits);
+        if (OPAL_UNLIKELY(0 > ret_length)) {
+            opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
+                                "%s:%d: fi_tinject failed: %zd",
+                                __FILE__, __LINE__, ret_length);
+            return ompi_mtl_ofi_get_error(ret);
+        }
+        
+        ofi_req->event_callback(NULL,ofi_req);
+    } else {
+        ret_length = fi_tsend(ompi_mtl_ofi.ep,
+                              start,
+                              length,
+                              ompi_mtl_ofi.mr,
+                              endpoint->peer_fiaddr,
+                              match_bits,
+                              (void *) &ofi_req->ctx);
 
-    if (OPAL_UNLIKELY(0 > ret_length)) {
-        opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
-                            "%s:%d: fi_tsend failed: %zd",
-                            __FILE__, __LINE__, ret_length);
-        return ompi_mtl_ofi_get_error(ret);
+        if (OPAL_UNLIKELY(0 > ret_length)) {
+            opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
+                                "%s:%d: fi_tsend failed: %zd",
+                                __FILE__, __LINE__, ret_length);
+            return ompi_mtl_ofi_get_error(ret);
+        }
     }
 
     return OMPI_SUCCESS;
diff --git a/ompi/mca/mtl/ofi/mtl_ofi_component.c b/ompi/mca/mtl/ofi/mtl_ofi_component.c
index 26eb5fcc97..712c1be13c 100644
--- a/ompi/mca/mtl/ofi/mtl_ofi_component.c
+++ b/ompi/mca/mtl/ofi/mtl_ofi_component.c
@@ -242,6 +242,11 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
         goto error;
     }
 
+    /**
+     * Save the maximum inject size.
+     */
+    ompi_mtl_ofi.max_inject_size = prov->tx_attr->inject_size;
+
     /**
      * Create the objects that will be bound to the endpoint.
      * The objects include:
diff --git a/ompi/mca/mtl/ofi/mtl_ofi_types.h b/ompi/mca/mtl/ofi/mtl_ofi_types.h
index cfa5a8b568..4855fbcdfd 100644
--- a/ompi/mca/mtl/ofi/mtl_ofi_types.h
+++ b/ompi/mca/mtl/ofi/mtl_ofi_types.h
@@ -58,6 +58,9 @@ typedef struct mca_mtl_ofi_module_t {
     /** Optional user-specified OFI provider name */
     char *provider_name;
 
+    /** Maximum inject size */
+    size_t max_inject_size;
+
 } mca_mtl_ofi_module_t;
 
 extern mca_mtl_ofi_module_t ompi_mtl_ofi;