diff --git a/htdocs/lib/Clock.js b/htdocs/lib/Clock.js
index 525ae929..5a9c2eac 100644
--- a/htdocs/lib/Clock.js
+++ b/htdocs/lib/Clock.js
@@ -1,32 +1,19 @@
 function Clock(el) {
-    const now = new Date();
-    const me = this;
-
-    // Run timer for the first time on the next minute change
-    setTimeout(function() { me.update(); }, 1000 * (60 - now.getUTCSeconds()));
-
-    this.el    = el;
-    this.timer = null;
-
-    // Draw for the first time
-    this.draw();
+    // Save HTML element to update
+    this.el = el;
+    // Update for the first time
+    this.update();
 }
 
 Clock.prototype.update = function() {
-    // Schedule timer in one minute intervals
-    if (!this.timer) {
-        const me = this;
-        this.timer = setInterval(function() { me.update(); }, 60000);
-    }
+    const now = new Date();
+    const me = this;
 
-    // Display UTC clock
-    this.draw();
-}
+    // Next update at the next minute change
+    setTimeout(function() { me.update(); }, 1000 * (60 - now.getUTCSeconds()));
 
-Clock.prototype.draw = function() {
     // Display UTC clock
     if (this.el) {
-        const now = new Date();
         const hours = ("00" + now.getUTCHours()).slice(-2);
         const minutes = ("00" + now.getUTCMinutes()).slice(-2);
         this.el.html(`${hours}:${minutes} UTC`);