diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index b7b22eca7db3b98047bbcad1b4a642a1daf49bf8..bca2b1b93c8181ffc80bdc4050cac3e321ef7a9a 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -547,7 +547,6 @@ ptlrpc_prep_req_pool(struct obd_import *imp, __u32 version, int opcode,
         atomic_set(&request->rq_refcount, 1);
 
         lustre_msg_set_opc(request->rq_reqmsg, opcode);
-        lustre_msghdr_set_flags(request->rq_reqmsg, imp->imp_msghdr_flags);
 
         RETURN(request);
 }
diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index d8960d22c65a26cc7c0ca40f5b6abd1c914548ae..f0e86c07e8ebf701d39a449c1ae038b01438a94a 100644
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -474,6 +474,8 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
         lustre_msg_set_type(request->rq_reqmsg, PTL_RPC_MSG_REQUEST);
         lustre_msg_set_conn_cnt(request->rq_reqmsg,
                                 request->rq_import->imp_conn_cnt);
+        lustre_msghdr_set_flags(request->rq_reqmsg,
+                                request->rq_import->imp_msghdr_flags);
 
         if (!noreply) {
                 LASSERT (request->rq_replen != 0);