diff --git a/pom.xml b/pom.xml
index ad6b3543..51f980db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 
     <properties>
         <build.number>unknown</build.number>
-        <netty.version>4.0.4.Final-SNAPSHOT</netty.version>
+        <netty.version>4.0.4.Final</netty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index a7334d28..83e1b2a2 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -209,11 +209,6 @@ public class BungeeCord extends ProxyServer
     @Override
     public void start() throws Exception
     {
-        if ( System.getProperty( "io.netty.noResourceLeakDetection" ) != null )
-        {
-            System.setProperty( "io.netty.noResourceLeakDetection", "true" );
-        }
-
         pluginsFolder.mkdir();
         pluginManager.detectPlugins( pluginsFolder );
         config.load();
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 3a12e660..76e5941f 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
@@ -63,10 +63,7 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
     {
-        if ( ctx.channel().isActive() )
-        {
-            msgs.add( msg );
-        }
+        msgs.add( msg );
     }
 
     @Override
@@ -76,7 +73,7 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
         while ( !msgs.isEmpty() )
         {
             Object msg = msgs.remove();
-            if ( handler != null && ctx.channel().isActive() )
+            if ( handler != null )
             {
                 if ( msg instanceof PacketWrapper )
                 {