diff --git a/domain/property_baseline/calculator_rebaseliner.py b/domain/property_baseline/calculator_rebaseliner.py
index cbfaace7..c6519c83 100644
--- a/domain/property_baseline/calculator_rebaseliner.py
+++ b/domain/property_baseline/calculator_rebaseliner.py
@@ -59,8 +59,8 @@ class CalculatorRebaseliner(Rebaseliner):
     ) -> tuple[Performance, RebaselineReason]:
         # A raise (UnmappedSapCode, etc.) propagates: the calculator is
         # load-bearing, so the batch aborts and the cert is fixed at once.
-        result = self._calculator.calculate(effective_epc)
-        sap_version = effective_epc.sap_version
+        result: SapResult = self._calculator.calculate(effective_epc)
+        sap_version: Optional[float] = effective_epc.sap_version
         if sap_version is not None and sap_version < _SAP10_2_FLOOR:
             return performance_from_sap_result(result), "pre_sap10"
         self._log_divergence(