diff --git a/server/src/classes/EventTimer.js b/server/src/classes/EventTimer.js
index b63bc7a93..fe4b7f86a 100644
--- a/server/src/classes/EventTimer.js
+++ b/server/src/classes/EventTimer.js
@@ -1304,7 +1304,7 @@ export class EventTimer extends Timer {
     if (this.selectedEventIndex === this.numEvents - 1) return;
 
     // if there is no event running, go to first
-    if (!this.selectedEventIndex) {
+    if (this.selectedEventIndex === null) {
       this.loadEvent(0);
     } else {
       const gotoEvent =