diff --git a/CHANGELOG.md b/CHANGELOG.md
index af9a97af..5e021df9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ _This release is scheduled to be released on 2020-07-01._
 
 - Added prettier for an even cleaner codebase
 
+- Hide Sunrise/Sunset in Weather module
+
 ### Updated
 
 - Cleaned up alert module code
diff --git a/modules/default/weather/current.njk b/modules/default/weather/current.njk
index 33dac07a..d89c5f53 100755
--- a/modules/default/weather/current.njk
+++ b/modules/default/weather/current.njk
@@ -22,14 +22,16 @@
             {% if config.showHumidity and current.humidity %}
                 <span>{{ current.humidity | decimalSymbol }}</span><sup>&nbsp;<i class="wi wi-humidity humidityIcon"></i></sup>
             {% endif %}
-            <span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
-            <span>
-                {% if current.nextSunAction() === "sunset" %}
-                    {{ current.sunset | formatTime }}
-                {% else %}
-                    {{ current.sunrise | formatTime }}
-                {% endif %}
-            </span>
+            {% if config.showSun %}
+                <span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
+                <span>
+                    {% if current.nextSunAction() === "sunset" %}
+                        {{ current.sunset | formatTime }}
+                    {% else %}
+                        {{ current.sunrise | formatTime }}
+                    {% endif %}
+                </span>
+            {% endif %}
         </div>
     {% endif %}
     <div class="large light">
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index b7ddd0c9..23afb549 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -31,6 +31,7 @@ Module.register("weather", {
 		useBeaufort: true,
 		lang: config.language,
 		showHumidity: false,
+		showSun: true,
 		degreeLabel: false,
 		decimalSymbol: ".",
 		showIndoorTemperature: false,
diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js
index 2b5f9774..3c9021f5 100644
--- a/tests/configs/modules/weather/currentweather_options.js
+++ b/tests/configs/modules/weather/currentweather_options.js
@@ -28,6 +28,7 @@ let config = {
 				initialLoadDelay: 3000,
 				useBeaufort: false,
 				showWindDirectionAsArrow: true,
+				showSun: false,
 				showHumidity: true,
 				roundTemp: true,
 				degreeLabel: true