diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40d015aa..9ee2ca4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ _This release is scheduled to be released on 2021-04-01._
 - Fix empty directory for each module's main javascript file in the inspector
 - Fix Issue with weather forecast icons unit tests with different timezones (#2221)
 - Fix issue with unencoded characters in translated strings when using nunjuck template (`Loading …` as an example)
+- Fix socket.io backward compatibility with socket v2 clients
 
 ## [2.14.0] - 2021-01-01
 
diff --git a/js/server.js b/js/server.js
index 231cd295..c68c0329 100644
--- a/js/server.js
+++ b/js/server.js
@@ -28,7 +28,11 @@ function Server(config, callback) {
 		server = require("http").Server(app);
 	}
 	const io = require("socket.io")(server, {
-		cors: {}
+		cors: {
+			origin: /.*$/,
+			credentials: true
+		},
+		allowEIO3: true
 	});
 
 	Log.log(`Starting server on port ${port} ... `);