diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index 7285bd2e..2a6d24b9 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -198,16 +198,19 @@ Module.register("currentweather",{
 		large.appendChild(weatherIcon);
 
 		var degreeLabel = "";
-		if (this.config.degreeLabel) {
-			switch (this.config.units ) {
+		if (this.config.units === "metric" || this.config.units === "imperial") {
+			degreeLabel += "°";
+		}
+		if(this.config.degreeLabel) {
+			switch(this.config.units) {
 			case "metric":
-				degreeLabel = " °C";
+				degreeLabel += "C";
 				break;
 			case "imperial":
-				degreeLabel = " °F";
+				degreeLabel += "F";
 				break;
 			case "default":
-				degreeLabel = " K";
+				degreeLabel += "K";
 				break;
 			}
 		}
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 3afc7f74..67193696 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -143,16 +143,19 @@ Module.register("weatherforecast",{
 			iconCell.appendChild(icon);
 
 			var degreeLabel = "";
+			if (this.config.units === "metric" || this.config.units === "imperial") {
+				degreeLabel += "°";
+			}
 			if(this.config.scale) {
 				switch(this.config.units) {
 				case "metric":
-					degreeLabel = " °C";
+					degreeLabel += "C";
 					break;
 				case "imperial":
-					degreeLabel = " °F";
+					degreeLabel += "F";
 					break;
 				case "default":
-					degreeLabel = " K";
+					degreeLabel = "K";
 					break;
 				}
 			}