diff --git a/lib/http.js b/lib/http.js
index 786f373e743..f061effe331 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -833,11 +833,17 @@ function connectionListener(socket) {
     if (message._last) {
       // No more messages to be pushed out.
 
-      // HACK: need way to do this with socket interface
-      if (socket._writeQueue.length) {
-        socket.__destroyOnDrain = true; //socket.end();
+      if (!socket._writeQueue) {
+        // Putting this here for https. Really need to add below hack to
+        // both socket and https interfaces.
+        socket.end();
       } else {
-        socket.destroy();
+        // HACK: need way to do this with socket interface
+        if (socket._writeQueue.length) {
+          socket.__destroyOnDrain = true; //socket.end();
+        } else {
+          socket.destroy();
+        }
       }
 
     } else if (socket._outgoing.length) {