diff --git a/lib/nvmf/conn.c b/lib/nvmf/conn.c
index 275986b2b..05045828c 100644
--- a/lib/nvmf/conn.c
+++ b/lib/nvmf/conn.c
@@ -839,7 +839,7 @@ static int nvmf_recv(struct spdk_nvmf_conn *conn, struct ibv_wc *wc)
 	nvmf_active_tx_desc(tx_desc);
 
 	req = &tx_desc->req_state;
-	req->session = conn->sess;
+	req->conn = conn;
 	req->tx_desc = tx_desc;
 	req->rx_desc = rx_desc;
 	req->length = 0;
diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index c72e8c719..804c49ce6 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -96,7 +96,7 @@ command_fail:
 int
 nvmf_process_admin_cmd(struct nvmf_request *req)
 {
-	struct nvmf_session *session = req->session;
+	struct nvmf_session *session = req->conn->sess;
 	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
 	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
 	struct spdk_nvmf_subsystem *subsystem = session->subsys;
@@ -373,7 +373,7 @@ passthrough:
 int
 nvmf_process_io_cmd(struct nvmf_request *req)
 {
-	struct nvmf_session *session = req->session;
+	struct nvmf_session *session = req->conn->sess;
 	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
 	struct spdk_nvme_cpl *response;
 	struct spdk_nvmf_subsystem *subsystem = session->subsys;
diff --git a/lib/nvmf/request.h b/lib/nvmf/request.h
index f703056b8..dbb205233 100644
--- a/lib/nvmf/request.h
+++ b/lib/nvmf/request.h
@@ -59,7 +59,7 @@ SPDK_STATIC_ASSERT(sizeof(union nvmf_c2h_msg) == 16, "Incorrect size");
 #define NVMF_C2H_MAX_MSG (sizeof(union nvmf_c2h_msg))
 
 struct nvmf_request {
-	struct nvmf_session		*session;
+	struct spdk_nvmf_conn		*conn;
 	struct nvme_qp_tx_desc		*tx_desc;
 	struct nvme_qp_rx_desc		*rx_desc;
 	uint16_t			cid;		/* command identifier */