diff --git a/lib/_http_client.js b/lib/_http_client.js
index 4d71ec594743f4..9d2057814133b7 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -376,6 +376,7 @@ function socketOnData(d) {
     socket.removeListener('data', socketOnData);
     socket.removeListener('end', socketOnEnd);
     parser.finish();
+    freeParser(parser, req, socket);
 
     var bodyHead = d.slice(bytesParsed, d.length);
 
@@ -398,7 +399,6 @@ function socketOnData(d) {
       // Got Upgrade header or CONNECT method, but have no handler.
       socket.destroy();
     }
-    freeParser(parser, req, socket);
   } else if (parser.incoming && parser.incoming.complete &&
              // When the status code is 100 (Continue), the server will
              // send a final response after this client sends a request
diff --git a/test/parallel/test-http-parser-freed-before-upgrade.js b/test/parallel/test-http-parser-freed-before-upgrade.js
new file mode 100644
index 00000000000000..4ba1de9501681c
--- /dev/null
+++ b/test/parallel/test-http-parser-freed-before-upgrade.js
@@ -0,0 +1,33 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const server = http.createServer();
+
+server.on('upgrade', common.mustCall((request, socket) => {
+  assert.strictEqual(socket.parser, null);
+  socket.write([
+    'HTTP/1.1 101 Switching Protocols',
+    'Connection: Upgrade',
+    'Upgrade: WebSocket',
+    '\r\n'
+  ].join('\r\n'));
+}));
+
+server.listen(common.mustCall(() => {
+  const request = http.get({
+    port: server.address().port,
+    headers: {
+      Connection: 'Upgrade',
+      Upgrade: 'WebSocket'
+    }
+  });
+
+  request.on('upgrade', common.mustCall((response, socket) => {
+    assert.strictEqual(socket.parser, null);
+    socket.destroy();
+    server.close();
+  }));
+}));