diff --git a/ntex-io/CHANGES.md b/ntex-io/CHANGES.md
index c9bef4d5..720f01f2 100644
--- a/ntex-io/CHANGES.md
+++ b/ntex-io/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.5] - 2023-01-27
+
+* Custom panic message for nested buffer borrow
+
 ## [0.2.4] - 2023-01-26
 
 * Refactor write task management
diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml
index 4cca9c14..87fa483a 100644
--- a/ntex-io/Cargo.toml
+++ b/ntex-io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-io"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for encoding and decoding frames"
 keywords = ["network", "framework", "async", "futures"]
diff --git a/ntex-io/src/ioref.rs b/ntex-io/src/ioref.rs
index a836e7e8..b2a5fac1 100644
--- a/ntex-io/src/ioref.rs
+++ b/ntex-io/src/ioref.rs
@@ -1,9 +1,9 @@
-use std::{any, fmt, hash, io, time};
+use std::{any, cell, fmt, hash, io, time};
 
 use ntex_bytes::{BytesVec, PoolRef};
 use ntex_codec::{Decoder, Encoder};
 
-use super::{io::Flags, timer, types, Filter, IoRef, OnDisconnect, WriteBuf};
+use super::{buf::Stack, io::Flags, timer, types, Filter, IoRef, OnDisconnect, WriteBuf};
 
 impl IoRef {
     #[inline]
@@ -132,9 +132,7 @@ impl IoRef {
     where
         U: Decoder,
     {
-        self.0
-            .buffer
-            .borrow_mut()
+        borrow_buffer(&self.0.buffer)
             .first_read_buf()
             .as_mut()
             .map(|b| codec.decode_vec(b))
@@ -159,7 +157,7 @@ impl IoRef {
     where
         F: FnOnce(&mut WriteBuf<'_>) -> R,
     {
-        let mut buffer = self.0.buffer.borrow_mut();
+        let mut buffer = borrow_buffer(&self.0.buffer);
         let result = buffer.write_buf(self, 0, f);
         self.0
             .filter
@@ -174,7 +172,7 @@ impl IoRef {
     where
         F: FnOnce(&mut BytesVec) -> R,
     {
-        let mut buffer = self.0.buffer.borrow_mut();
+        let mut buffer = borrow_buffer(&self.0.buffer);
         let result = f(buffer.first_write_buf(self));
         self.0
             .filter
@@ -191,7 +189,7 @@ impl IoRef {
         F: FnOnce(&mut BytesVec) -> R,
     {
         // use top most buffer
-        let mut buffer = self.0.buffer.borrow_mut();
+        let mut buffer = borrow_buffer(&self.0.buffer);
         let buf = buffer.first_read_buf();
         if buf.is_none() {
             *buf = Some(self.memory_pool().get_read_buf());
@@ -253,6 +251,14 @@ impl fmt::Debug for IoRef {
     }
 }
 
+fn borrow_buffer(buf: &cell::RefCell<Stack>) -> cell::RefMut<'_, Stack> {
+    if let Ok(r) = buf.try_borrow_mut() {
+        r
+    } else {
+        panic!("Nested access to read/write buffers are not allowed");
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::cell::{Cell, RefCell};