diff --git a/include/spdk_internal/bdev.h b/include/spdk_internal/bdev.h
index 44de5948b..15fef35a9 100644
--- a/include/spdk_internal/bdev.h
+++ b/include/spdk_internal/bdev.h
@@ -274,6 +274,9 @@ struct spdk_bdev_io {
 	/** The bdev I/O channel that this was submitted on. */
 	struct spdk_bdev_channel *ch;
 
+	/** The mgmt channel that this I/O was allocated from. */
+	struct spdk_bdev_mgmt_channel *mgmt_ch;
+
 	/** bdev allocated memory associated with this request */
 	void *buf;
 
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index 50e259ae3..b2f3fca93 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -283,7 +283,7 @@ spdk_bdev_io_put_buf(struct spdk_bdev_io *bdev_io)
 	assert(bdev_io->u.bdev.iovcnt == 1);
 
 	buf = bdev_io->buf;
-	ch = spdk_io_channel_get_ctx(bdev_io->ch->mgmt_channel);
+	ch = bdev_io->mgmt_ch;
 
 	if (bdev_io->buf_len <= SPDK_BDEV_SMALL_BUF_MAX_SIZE) {
 		pool = g_bdev_mgr.buf_small_pool;
@@ -754,13 +754,15 @@ spdk_bdev_get_io(struct spdk_io_channel *_ch)
 		}
 	}
 
+	bdev_io->mgmt_ch = ch;
+
 	return bdev_io;
 }
 
 static void
 spdk_bdev_put_io(struct spdk_bdev_io *bdev_io)
 {
-	struct spdk_bdev_mgmt_channel *ch = spdk_io_channel_get_ctx(bdev_io->ch->mgmt_channel);
+	struct spdk_bdev_mgmt_channel *ch = bdev_io->mgmt_ch;
 
 	if (bdev_io->buf != NULL) {
 		spdk_bdev_io_put_buf(bdev_io);