diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog
index 4fcdbd653..58ab4cd48 100644
--- a/apps/circlesclock/ChangeLog
+++ b/apps/circlesclock/ChangeLog
@@ -18,3 +18,4 @@
       Refactor settings menu
       Colors of circles can be configured
       Color depending on value (green -> red, red -> green) option
+      Good HRM value will not be overwritten so fast anymore
diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index 05f9779ef..49af2a057 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -803,13 +803,13 @@ Bangle.on('HRM', function(hrm) {
         drawHeartRate();
       }
     }
-    // Let us wait a bit before we overwrite "good" HRM values:
+    // Let us wait before we overwrite "good" HRM values:
     if (Bangle.isLCDOn()) {
       if (timerHrm) clearTimeout(timerHrm);
       timerHrm = setTimeout(() => {
         hrtValue = '...';
         drawHeartRate();
-      }, 60000);
+      }, settings.hrmValidity * 1000 || 30000);
     }
   }
 });
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js
index 2173c84ae..348d187eb 100644
--- a/apps/circlesclock/settings.js
+++ b/apps/circlesclock/settings.js
@@ -61,23 +61,23 @@
     let menu = {
       '': { 'title': /*LANG*/'Heartrate' },
       /*LANG*/'< Back': ()=>showMainMenu(),
-      /*LANG*/'minimum bpm': {
+      /*LANG*/'minimum': {
         value: "minHR" in settings ? settings.minHR : 40,
         min: 0,
         max : 250,
         step: 5,
         format: x => {
-          return x;
+          return x + " bpm";
         },
         onchange: x => save('minHR', x),
       },
-      /*LANG*/'maximum bpm': {
+      /*LANG*/'maximum': {
         value: "maxHR" in settings ? settings.maxHR : 200,
         min: 20,
         max : 250,
         step: 5,
         format: x => {
-          return x;
+          return x + " bpm";
         },
         onchange: x => save('maxHR', x),
       },
@@ -87,10 +87,20 @@
         max : 100,
         step: 10,
         format: x => {
-          return x;
+          return x + "%";
         },
         onchange: x => save('confidence', x),
       },
+      /*LANG*/'valid period': {
+        value: "hrmValidity" in settings ? settings.hrmValidity : 30,
+        min: 10,
+        max : 600,
+        step: 10,
+        format: x => {
+          return x + "s";
+        },
+        onchange: x => save('hrmValidity', x),
+      },
     };
     E.showMenu(menu);
   }