diff --git a/llarp/utp/inbound_message.cpp b/llarp/utp/inbound_message.cpp
index 25d613a5a..f1edc0bab 100644
--- a/llarp/utp/inbound_message.cpp
+++ b/llarp/utp/inbound_message.cpp
@@ -21,7 +21,6 @@ namespace llarp
       buffer.cur += sz;
       return true;
     }
-    IBMsgPool_t IBPool;
 
   }  // namespace utp
 
diff --git a/llarp/utp/inbound_message.hpp b/llarp/utp/inbound_message.hpp
index 1541616da..ac67268c3 100644
--- a/llarp/utp/inbound_message.hpp
+++ b/llarp/utp/inbound_message.hpp
@@ -80,10 +80,7 @@ namespace llarp
       return lhs.buffer.base == rhs.buffer.base;
     }
 
-    using IBMsgPool_t = util::AllocPool< _InboundMessage, 1024 >;
-    extern IBMsgPool_t IBPool;
-
-    using InboundMessage = _InboundMessage*;
+    using InboundMessage = std::shared_ptr< _InboundMessage >;
 
   }  // namespace utp
 
diff --git a/llarp/utp/session.cpp b/llarp/utp/session.cpp
index 35f528b30..121ec47ed 100644
--- a/llarp/utp/session.cpp
+++ b/llarp/utp/session.cpp
@@ -10,8 +10,10 @@ namespace llarp
   namespace utp
   {
     using SendBufferPool = util::AllocPool< FragmentBuffer, 1024 * 4 >;
+    using RecvBufferPool = util::AllocPool< _InboundMessage, 1024 >;
 
     static SendBufferPool OBPool;
+    static RecvBufferPool IBPool;
 
     using namespace std::placeholders;