diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 7fbe0acc3..1d7e22881 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -46,14 +46,13 @@
 
 #define nvmf_min(a,b) (((a)<(b))?(a):(b))
 
-#define SMALL_BB_MAX_SIZE 4096
-#define LARGE_BB_MAX_SIZE (128 * 1024)
+#define DEFAULT_BB_SIZE (128 * 1024)
 
 /*
  * NVMf target supports a maximum transfer size that is equal to
  * a single allocated bounce buffer per request.
  */
-#define SPDK_NVMF_MAX_RECV_DATA_TRANSFER_SIZE  LARGE_BB_MAX_SIZE
+#define SPDK_NVMF_MAX_RECV_DATA_TRANSFER_SIZE  DEFAULT_BB_SIZE
 
 #define SPDK_NVMF_DEFAULT_NUM_SESSIONS_PER_LCORE 1
 #define SPDK_NVMF_DEFAULT_NODEBASE "nqn.2016-06.io.spdk"
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 4929b8830..cf7fba7d2 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -197,12 +197,7 @@ alloc_rdma_req(struct spdk_nvmf_conn *conn)
 	rdma_req->recv_sgl[0].length = sizeof(rdma_req->cmd);
 	rdma_req->recv_sgl[0].lkey = rdma_req->cmd_mr->lkey;
 
-	if (conn->type == CONN_TYPE_AQ) {
-		/* Admin commands can only send 4k of data maximum */
-		rdma_req->bb_len = SMALL_BB_MAX_SIZE;
-	} else {
-		rdma_req->bb_len = LARGE_BB_MAX_SIZE;
-	}
+	rdma_req->bb_len = DEFAULT_BB_SIZE;
 	rdma_req->bb = rte_zmalloc("nvmf_bb", rdma_req->bb_len, 0);
 	if (!rdma_req->bb) {
 		SPDK_ERRLOG("Unable to get %u byte bounce buffer\n", rdma_req->bb_len);