diff --git a/lib/client.js b/lib/client.js
index d399ebd..afa8ed0 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -22,9 +22,6 @@ Client.prototype.setSocket = function(socket) {
   var self = this;
   self.socket = socket;
   var incomingBuffer = new Buffer(0);
-
-  self.socket.setNoDelay();
-
   self.socket.on('data', function(data) {
     if (self.encryptionEnabled) data = new Buffer(self.decipher.update(data), 'binary');
     incomingBuffer = Buffer.concat([incomingBuffer, data]);
diff --git a/lib/server.js b/lib/server.js
index ccf92a6..62d1c40 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -23,8 +23,6 @@ Server.prototype.listen = function(port, host) {
   var nextId = 0;
   self.socketServer = net.createServer();
   self.socketServer.on('connection', function(socket) {
-    socket.setNoDelay();
-
     var client = new Client(true);
     client._end = client.end;
     client.end = function end(endReason) {