diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 7b5d23fd..0fd2d7f6 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -181,7 +181,7 @@
 #endif
 
 #ifndef HEARTBEAT_INTERVAL
-#define HEARTBEAT_INTERVAL          300000      // Interval between heartbeat messages (in ms)
+#define HEARTBEAT_INTERVAL          300         // Interval between heartbeat messages (in sec)
 #endif
 
 #define UPTIME_OVERFLOW             4294967295  // Uptime overflow value
diff --git a/code/espurna/system.ino b/code/espurna/system.ino
index 7d015bb8..27b2d4dd 100644
--- a/code/espurna/system.ino
+++ b/code/espurna/system.ino
@@ -82,8 +82,6 @@ unsigned long systemLoadAverage() {
 }
 
 void _systemSetupHeartbeat() {
-    if (getSetting("hbMode").length() == 0)  setSetting("hbMode", HEARTBEAT_MODE);
-    if (getSetting("hbInterval").length() == 0)  setSetting("hbInterval", HEARTBEAT_INTERVAL);
     _heartbeat_mode = getSetting("hbMode", HEARTBEAT_MODE).toInt();
     _heartbeat_interval = getSetting("hbInterval", HEARTBEAT_INTERVAL).toInt();
 }
@@ -116,9 +114,9 @@ void systemLoop() {
     } else if (_heartbeat_mode == HEARTBEAT_REPEAT || _heartbeat_mode == HEARTBEAT_REPEAT_STATUS) {
         static unsigned long last_hbeat = 0;
         #if NTP_SUPPORT
-            if ((_system_send_heartbeat && ntpSynced()) || (millis() - last_hbeat > _heartbeat_interval)) {
+            if ((_system_send_heartbeat && ntpSynced()) || (millis() - last_hbeat > _heartbeat_interval * 1000)) {
         #else
-            if (_system_send_heartbeat || (millis() - last_hbeat > _heartbeat_interval)) {
+            if (_system_send_heartbeat || (millis() - last_hbeat > _heartbeat_interval * 1000)) {
         #endif
             last_hbeat = millis();
             heartbeat();
diff --git a/code/html/index.html b/code/html/index.html
index 9d8f6ede..349ebfcb 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -621,30 +621,27 @@
                                 </div>
 
                                 <div class="pure-g">
-                                    <label class="pure-u-1 pure-u-lg-1-4">Heartbeat mode</label>
+                                    <label class="pure-u-1 pure-u-lg-1-4">Heartbeat message</label>
                                     <select class="pure-u-1 pure-u-lg-1-4" name="hbMode" tabindex="15" >
-                                        <option value="0">HEARTBEAT_NONE</option>
-                                        <option value="1">HEARTBEAT_ONCE</option>
-                                        <option value="2">HEARTBEAT_REPEAT</option>
-                                        <option value="3">HEARTBEAT_REPEAT_STATUS</option>
+                                        <option value="0">Disabled</option>
+                                        <option value="1">On device startup</option>
+                                        <option value="2">Repeat after defined interval</option>
+                                        <option value="3">Repeat only device status</option>
                                     </select>
                                     <div class="pure-u-0 pure-u-lg-1-2"></div>
                                     <div class="pure-u-0 pure-u-lg-1-4"></div>
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">
-                                        <strong>HEARTBEAT_NONE:</strong> no heartbeat at all, never.<br />
-                                        <strong>HEARTBEAT_ONCE:</strong> only on device startup.<br />
-                                        <strong>HEARTBEAT_REPEAT:</strong> on device startup and after HEARTBEAT_INTERVAL.<br />
-                                        <strong>HEARTBEAT_REPEAT_STATUS:</strong> on device startup full heartbeat information and after HEARTBEAT_INTERVAL only STATUS report.
+                                        Define when heartbeat message will be sent.
                                     </div>
                                 </div>
 
                                 <div class="pure-g">
                                     <label class="pure-u-1 pure-u-lg-1-4">Heartbeat interval</label>
-                                    <input name="hbInterval" class="pure-u-1 pure-u-lg-1-4" type="text" tabindex="16" />
+                                    <input name="hbInterval" class="pure-u-1 pure-u-lg-1-4" type="number" tabindex="16" />
                                     <div class="pure-u-0 pure-u-lg-1-2"></div>
                                     <div class="pure-u-0 pure-u-lg-1-4"></div>
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">
-                                        This is the interval in <strong>ms</strong> how often to send the heartbeat message.
+                                        This is the interval in <strong>seconds</strong> how often to send the heartbeat message.
                                     </div>
                                 </div>