diff --git a/src/CHANGES.md b/src/CHANGES.md
index 6de9830a..26a38c00 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -9,6 +9,7 @@
 * improved zero values on triggers #671
 * hardcoded MQTT subtopics, because wildcard `#` leads to errors
 * rephrased some messages on webif, thx to @Argafal #638
+* fixed 'polling stop message' on `index.html` #639
 
 ## 0.5.84
 * fix blue LED lights up all the time #672
diff --git a/src/web/html/index.html b/src/web/html/index.html
index 21bfb5f6..3a1628b3 100644
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -142,12 +142,12 @@
                     e.addEventListener("click", setTime);
                 }
 
-                if(obj["ts_sunrise"] > 0) {
+                if(obj["disNightComm"]) {
                     if(((obj["ts_sunrise"] - obj["ts_offset"]) < obj["ts_now"])
                         && ((obj["ts_sunset"] + obj["ts_offset"]) > obj["ts_now"])) {
                         commInfo = "Polling inverter(s), will stop at sunset " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE'));
                     }
-                    else if(obj["disNightComm"]) {
+                    else {
                         commInfo = "Night time, inverter polling disabled, ";
                         if(obj["ts_now"] > (obj["ts_sunrise"] - obj["ts_offset"])) {
                             commInfo += "stopped at " + (new Date((obj["ts_sunset"] + obj["ts_offset"]) * 1000).toLocaleString('de-DE'));