diff --git a/doc/api/http.md b/doc/api/http.md
index b705638d994689..dad22731317057 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -744,6 +744,9 @@ Returns `true` if the entire data was flushed successfully to the kernel
 buffer. Returns `false` if all or part of the data was queued in user memory.
 `'drain'` will be emitted when the buffer is free again.
 
+When `write` function is called with empty string or buffer, it does
+nothing and waits for more input.
+
 ## Class: http.Server
 <!-- YAML
 added: v0.1.17
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index 7fe4e2133b46a5..67d0090d7dabf7 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -599,7 +599,10 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
 
   // If we get an empty string or buffer, then just do nothing, and
   // signal the user to keep writing.
-  if (chunk.length === 0) return true;
+  if (chunk.length === 0) {
+    debug('received empty string or buffer and waiting for more input');
+    return true;
+  }
 
   if (!fromEnd && msg.connection && !msg[kIsCorked]) {
     msg.connection.cork();