diff --git a/pylib/anki/schedv2.py b/pylib/anki/schedv2.py
index 7cff185aa..76110b686 100644
--- a/pylib/anki/schedv2.py
+++ b/pylib/anki/schedv2.py
@@ -1385,11 +1385,14 @@ where id = ?
         return self.col.conf.get("rollover", 4)
 
     def _timing_today(self) -> SchedTimingToday:
+        roll: Optional[int] = None
+        if self.col.schedVer() > 1:
+            roll = self._rolloverHour()
         return self.col.backend.sched_timing_today(
             self.col.crt,
             self._creation_timezone_offset(),
             self._current_timezone_offset(),
-            self._rolloverHour(),
+            roll,
         )
 
     def _current_timezone_offset(self) -> Optional[int]:
diff --git a/pylib/anki/storage.py b/pylib/anki/storage.py
index f19c4d327..948b45839 100644
--- a/pylib/anki/storage.py
+++ b/pylib/anki/storage.py
@@ -5,6 +5,7 @@ import copy
 import json
 import os
 import weakref
+from dataclasses import dataclass
 from typing import Any, Dict, Optional, Tuple
 
 from anki.collection import _Collection
@@ -23,6 +24,7 @@ from anki.stdmodels import (
 from anki.utils import intTime
 
 
+@dataclass
 class ServerData:
     minutes_west: Optional[int] = None