diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8703808..82c18730 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [3.6.1](https://github.com/socketio/engine.io/compare/3.6.0...3.6.1) (2022-11-20)
+
+
+### Bug Fixes
+
+* catch errors when destroying invalid upgrades ([83c4071](https://github.com/socketio/engine.io/commit/83c4071af871fc188298d7d591e95670bf9f9085))
+
+
+
 # [3.6.0](https://github.com/socketio/engine.io/compare/3.5.0...3.6.0) (2022-06-06)
 
 
diff --git a/lib/server.js b/lib/server.js
index 4f2b8733..1ffce26b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -487,6 +487,9 @@ Server.prototype.attach = function (server, options) {
         // then the socket needs to die!
         setTimeout(function () {
           if (socket.writable && socket.bytesWritten <= 0) {
+            socket.on('error', e => {
+              debug('error while destroying upgrade: %s', e.message);
+            });
             return socket.end();
           }
         }, destroyUpgradeTimeout);
diff --git a/package.json b/package.json
index ce815e91..9cc212df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "The realtime engine behind Socket.IO. Provides the foundation of a bidirectional connection between client and server",
   "main": "lib/engine.io.js",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",