diff --git a/lib/nvmf/conn.c b/lib/nvmf/conn.c
index ec9c76ba2..b6cccd21b 100644
--- a/lib/nvmf/conn.c
+++ b/lib/nvmf/conn.c
@@ -490,9 +490,6 @@ static int nvmf_recv(struct spdk_nvmf_conn *conn, struct ibv_wc *wc)
 	req->conn = conn;
 	req->tx_desc = tx_desc;
 	req->rx_desc = rx_desc;
-	req->length = 0;
-	req->xfer = SPDK_NVME_DATA_NONE;
-	req->data = NULL;
 	req->cid = cap_hdr->cid;
 	req->cmd = &rx_desc->cmd;
 
diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index 794cbbde4..ce43316ff 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -553,6 +553,10 @@ spdk_nvmf_request_prep_data(struct nvmf_request *req,
 	enum spdk_nvme_data_transfer xfer;
 	int ret;
 
+	req->length = 0;
+	req->xfer = SPDK_NVME_DATA_NONE;
+	req->data = NULL;
+
 	if (cmd->opc == SPDK_NVME_OPC_FABRIC) {
 		xfer = spdk_nvme_opc_get_data_transfer(req->cmd->nvmf_cmd.fctype);
 	} else {