diff --git a/lib/tls.js b/lib/tls.js
index 2dd8f16d0..e84d501fc 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -679,6 +679,8 @@ SecurePair.prototype.destroy = function() {
     self.cleartext.writable = self.cleartext.readable = false;
 
     process.nextTick(function() {
+      self.encrypted.emit('end');
+      self.cleartext.emit('end');
       self.encrypted.emit('close');
       self.cleartext.emit('close');
     });
@@ -1025,7 +1027,7 @@ function pipe(pair, socket) {
 
   function onclose() {
     socket.removeListener('error', onerror);
-    socket.removeListener('close', onclose);
+    socket.removeListener('end', onclose);
     socket.removeListener('timeout', ontimeout);
   }