diff --git a/lib/net.js b/lib/net.js
index c8eb6701c41..fd825dad7fb 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -937,6 +937,8 @@ Stream.prototype.setTimeout = function (msecs) {
   if (msecs > 0) {
     timeout.enroll(this, msecs);
     if (this.fd) { timeout.active(this); }
+  } else if (msecs === 0) {
+    timeout.unenroll(this);
   }
 };