diff --git a/src/main/java/net/md_5/bungee/Configuration.java b/src/main/java/net/md_5/bungee/Configuration.java
index e8f1f7f04..c199cae68 100644
--- a/src/main/java/net/md_5/bungee/Configuration.java
+++ b/src/main/java/net/md_5/bungee/Configuration.java
@@ -133,7 +133,6 @@ public class Configuration
      */
     public String statsUuid = UUID.randomUUID().toString();
     public boolean metricsEnabled = true;
-    public int bufferSize = 2048;
 
     /**
      * Load the configuration and save default values.
diff --git a/src/main/java/net/md_5/bungee/InitialHandler.java b/src/main/java/net/md_5/bungee/InitialHandler.java
index e5790a4d6..4e35f24c3 100644
--- a/src/main/java/net/md_5/bungee/InitialHandler.java
+++ b/src/main/java/net/md_5/bungee/InitialHandler.java
@@ -68,7 +68,7 @@ public class InitialHandler implements Runnable
 
                     out.write(new PacketFCEncryptionResponse().getPacket());
                     in = new PacketInputStream(new CipherInputStream(socket.getInputStream(), EncryptionUtil.getCipher(false, shared)));
-                    out = new CipherOutputStream(new BufferedOutputStream(socket.getOutputStream(), BungeeCord.instance.config.bufferSize), EncryptionUtil.getCipher(true, shared));
+                    out = new CipherOutputStream(socket.getOutputStream(), EncryptionUtil.getCipher(true, shared));
                     List<byte[]> customPackets = new ArrayList<>();
                     byte[] custom;
                     while (Util.getId((custom = in.readPacket())) != 0xCD)
diff --git a/src/main/java/net/md_5/bungee/ServerConnection.java b/src/main/java/net/md_5/bungee/ServerConnection.java
index 72fc1d852..0a7c9541f 100644
--- a/src/main/java/net/md_5/bungee/ServerConnection.java
+++ b/src/main/java/net/md_5/bungee/ServerConnection.java
@@ -66,7 +66,7 @@ public class ServerConnection extends GenericConnection
                 out.write(new PacketFAPluginMessage("REGISTER", channel.getBytes()).getPacket());
             }
 
-            out = new BufferedOutputStream(out, BungeeCord.instance.config.bufferSize);
+            out = new BufferedOutputStream(out, 64);
 
             return new ServerConnection(name, socket, in, out, login);
         } catch (KickException ex)