diff --git a/apps/server/src/services/report-service/ReportService.ts b/apps/server/src/services/report-service/ReportService.ts
index 62855672f8..929999e9cb 100644
--- a/apps/server/src/services/report-service/ReportService.ts
+++ b/apps/server/src/services/report-service/ReportService.ts
@@ -21,13 +21,25 @@ export function clear(id?: string) {
 }
 
 export function eventStart(state: RuntimeState) {
+  // eslint-disable-next-line no-unused-labels -- dev code path
+  DEV: {
+    if (state.eventNow === null) {
+      throw new Error('report.eventStart: called without eventNow present');
+    }
+  }
+
   report.set(state.eventNow.id, { ...blankReportData, startAt: state.timer.startedAt });
 }
 
 export function eventStop(state: RuntimeState) {
-  if (state.eventNow?.id === undefined) {
-    return;
+  // eslint-disable-next-line no-unused-labels -- dev code path
+  DEV: {
+    if (state.eventNow === null) {
+      throw new Error('report.eventStop: called without eventNow present');
+    }
   }
+
+  //TODO: How should pauses be calculated into the report?
   const prevReport = report.get(state.eventNow.id);
   if (prevReport !== undefined && prevReport.startAt !== null) {
     prevReport.endAt = state.clock;