diff --git a/src/store/index.js b/src/store/index.js
index def5b0cc..1034f8b8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -267,8 +267,18 @@ export const useMainStore = defineStore({
         },
         hasRecalibrationPart: (storeState) => getHasRecalibrationPart(storeState),
         vehicle: (storeState) => storeState.order.vehicle,
-        damage: (storeState) => storeState.order.damage,
-        lineItems: (state) => state.order.lineItems,
+        damage: (storeState) => {
+            if (storeState.submittedOrder) {
+                return storeState.submittedOrder.damage;
+            }
+            return storeState.order.damage;
+        },
+        lineItems: (state) => {
+            if (state.submittedOrder) {
+                return state.submittedOrder.lineItems;
+            }
+            return state.order.lineItems;
+        },
         payment: (state) => state.order.payment,
         policy: (state) => state.order.policy,
         hasExactlyOneChip: () => state.order.damage.numberOfChips === 1,
@@ -282,22 +292,36 @@ export const useMainStore = defineStore({
         isClaimAlreadyRegistered: (state) => state.order.payment.insuranceCoverage.claimNumber !== null,
         isBailout: (state) => state.applicationUser.pageData[issPageValues.BAILOUT_PAGE] != null,
         bailoutCode: (state) => state.applicationUser.pageData[issPageValues.BAILOUT_PAGE]?.bailoutCode,
-        isNoComp: (s) => !!s.order.policy.noCoverage,
-        isITAC: (state) => !!state.order.policy.isITAC,
+        isNoComp: (s) => {
+            if (s.submittedOrder) {
+                return !!s.submittedOrder.policy.noCoverage;
+            }
+            return !!s.order.policy.noCoverage;
+        },
+        isITAC: (state) => {
+            if (state.submittedOrder) {
+                return !!state.submittedOrder.policy.isITAC;
+            }
+            return !!state.order.policy.isITAC;
+        },
         isUnverified: (s) => {
-            const { payment, currentDeductible, policy } = s.order;
+            let orderToUse = {};
+            if (s.submittedOrder) {
+                orderToUse = s.submittedOrder;
+            } else orderToUse = s.order;
+            const { payment, currentDeductible, policy } = orderToUse;
             const { policyLookupSuccessful } = policy;
             const registerClaimSuccessful = !!payment.insuranceCoverage.isVerified;
             if (!policyLookupSuccessful) {
                 return true;
             }
-            if (s.isNoComp && !s.issConfig.enableNoCompQuote) {
+            if (orderToUse.isNoComp && !orderToUse.issConfig.enableNoCompQuote) {
                 return true;
             }
-            if (!s.isNoComp && currentDeductible == null) {
+            if (!orderToUse.isNoComp && currentDeductible == null) {
                 return true;
             }
-            if (s.isClaimRegistrationRequired && !registerClaimSuccessful) {
+            if (orderToUse.isClaimRegistrationRequired && !registerClaimSuccessful) {
                 return true;
             }
             return false;