diff --git a/G-Earth/src/main/java/gearth/extensions/Extension.java b/G-Earth/src/main/java/gearth/extensions/Extension.java
index a74b280..62de7ac 100644
--- a/G-Earth/src/main/java/gearth/extensions/Extension.java
+++ b/G-Earth/src/main/java/gearth/extensions/Extension.java
@@ -90,6 +90,7 @@ public abstract class Extension implements IExtension{
         Socket gEarthExtensionServer = null;
         try {
             gEarthExtensionServer = new Socket("127.0.0.1", port);
+            gEarthExtensionServer.setTcpNoDelay(true);
             InputStream in = gEarthExtensionServer.getInputStream();
             DataInputStream dIn = new DataInputStream(in);
             out = gEarthExtensionServer.getOutputStream();
diff --git a/G-Earth/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java
index 8f00689..0da69f7 100644
--- a/G-Earth/src/main/java/gearth/protocol/HConnection.java
+++ b/G-Earth/src/main/java/gearth/protocol/HConnection.java
@@ -260,6 +260,7 @@ public class HConnection {
                         while ((state == State.WAITING_FOR_CLIENT) && !proxy_server.isClosed())	{
                             try {
                                 Socket client = proxy_server.accept();
+                                client.setTcpNoDelay(true);
                                 actual_proxy = potentialProxy;
                                 closeAllProxies(actual_proxy);
                                 if (DEBUG) System.out.println("accepted a proxy");
@@ -293,6 +294,7 @@ public class HConnection {
         final boolean[] datastream = new boolean[1];
 
         Socket habbo_server = new Socket(proxy.actual_domain, proxy.actual_port);
+        habbo_server.setTcpNoDelay(true);
 
         OutputStream client_out = client.getOutputStream();
         InputStream client_in = client.getInputStream();