diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
index b3201ea..3b98b7f 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
@@ -269,15 +269,14 @@ const loadKpReaction: IReactionEffect = calculationStore => ({
 
           const { evo_sumpay_withnds } = evo_graph;
 
-          const requirementTelematicSource = recalcWithRevision
-            ? 'evo_req_telematic_accept'
-            : 'evo_req_telematic';
-          const requirementTelematic = quote[requirementTelematicSource];
-
-          const vehicleTaxInYearSource = recalcWithRevision
-            ? 'evo_vehicle_tax_approved'
-            : 'evo_vehicle_tax_year';
-          const vehicleTaxInYear = quote[vehicleTaxInYearSource];
+          let requirementTelematic = quote['evo_req_telematic'];
+          let vehicleTaxInYear = quote['evo_vehicle_tax_year'];
+          if (recalcWithRevision) {
+            if (quote['evo_vehicle_tax_approved']) {
+              vehicleTaxInYear = quote['evo_vehicle_tax_approved'];
+            }
+            requirementTelematic = quote['evo_req_telematic_accept'];
+          }
 
           calculationStore.setValues({
             ...initialValues,