1 files changed, 4 insertions, 4 deletions
diff --git a/lib/net.js b/lib/net.js
index 800bae38cf5..8e6dcbf7bf9 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -626,7 +626,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
     return false;
   }
 
-  var req = { oncomplete: afterWrite };
+  var req = { oncomplete: afterWrite, async: false };
   var err;
 
   if (writev) {
@@ -660,10 +660,10 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
 
   // If it was entirely flushed, we can write some more right now.
   // However, if more is left in the queue, then wait until that clears.
-  if (this._handle.writeQueueSize === 0)
-    cb();
-  else
+  if (req.async && this._handle.writeQueueSize != 0)
     req.cb = cb;
+  else
+    cb();
 };