diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index ca1a78da..74ac909e 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -15,7 +15,7 @@ public class ChannelWrapper
     private final Channel ch;
     @Getter
     private volatile boolean closed;
-    private final MessageList<Object> queue = MessageList.newInstance();
+    final MessageList<Object> queue = MessageList.newInstance();
     private volatile boolean flushNow = true;
 
     public ChannelWrapper(ChannelHandlerContext ctx)
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index ede4ad5c..f784ad5c 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -56,6 +56,7 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
                 ProxyServer.getInstance().getLogger().log( Level.INFO, "{0} has disconnected", handler );
             }
         }
+        channel.queue.recycle();
     }
 
     @Override