diff --git a/CHANGELOG.md b/CHANGELOG.md
index b781f42f38..f45da9dd92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240)
 - In default module currentWeather/currentWeather.js line 296, 300, self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable.
 - Fixed browser-side code to work on the Midori browser.
+- Fixed issue where heat index was reporting incorrect values in Celsius and Fahrenheit. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
 
 ### Updated
 - Updated Italian translation
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index b0ab40dc1b..106b7920ea 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -432,9 +432,9 @@ Module.register("currentweather",{
 				- 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity;
 
 			switch (this.config.units){
-			case "metric": this.feelsLike = Hindex.toFixed(0);
+			case "metric": this.feelsLike = parseFloat((Hindex - 32) / 1.8).toFixed(0);
 				break;
-			case "imperial": this.feelsLike = parseFloat(Hindex * 1.8 + 32).toFixed(0);
+			case "imperial": this.feelsLike = Hindex.toFixed(0);
 				break;
 			case "default":
 				var tc = Hindex - 273.15;