diff --git a/CHANGELOG.md b/CHANGELOG.md
index c631831c..c478e379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ _This release is scheduled to be released on 2022-04-01._
 - Added a config option under the weather module, absoluteDates, providing an option to format weather forecast date output with either absolute or relative dates.
 - Added test for new weather forecast absoluteDates porperty.
 - The modules get a class hidden added/removed if they get hidden/shown
+- Added internal cors proxy to get weather providers working without public proxies (fixes #2714). The new url `http(s)://address:port/cors?url=https://whatever-to-proxy` can be used in other modules too.
 
 ### Updated
 
diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js
index e2a9d32f..4acfe47e 100644
--- a/modules/default/weather/weatherprovider.js
+++ b/modules/default/weather/weatherprovider.js
@@ -112,11 +112,15 @@ const WeatherProvider = Class.extend({
 	},
 
 	getCorsUrl: function () {
-		const url = window.config.address + ":" + window.config.port + "/cors?url=";
-		if (window.config.useHttps) {
-			return "https://" + url;
+		if (this.config.mockData) {
+			return "";
 		} else {
-			return "http://" + url;
+			const url = window.config.address + ":" + window.config.port + "/cors?url=";
+			if (window.config.useHttps) {
+				return "https://" + url;
+			} else {
+				return "http://" + url;
+			}
 		}
 	},