diff --git a/server/classes/EventTimer.js b/server/classes/EventTimer.js
index ed11b285f..975b751bc 100644
--- a/server/classes/EventTimer.js
+++ b/server/classes/EventTimer.js
@@ -605,6 +605,7 @@ class EventTimer extends Timer {
   }
 
   goto(eventIndex) {
+    // load event
     this.loadEvent(eventIndex);
 
     // broadcast current state
diff --git a/server/classes/Timer.js b/server/classes/Timer.js
index b212606db..ea0e25d38 100644
--- a/server/classes/Timer.js
+++ b/server/classes/Timer.js
@@ -130,6 +130,7 @@ class Timer {
     if (this.state === 'start') return;
     else if (this.duration === 0) return;
     else if (this.startedAt == null) {
+      this._resetTimers();
       const now = this._getCurrentTime();
       this._startedAt = now;
       this._finishAt = now + this.duration;