diff --git a/src/store/index.js b/src/store/index.js
index 72faf237d..8ade2e5a5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1255,10 +1255,12 @@ export const actions = {
                 additionalAuthFlag: "",
             },
             partSelection: {
-                hasAnsweredPartQuestions: !!order.damage.partQuestionAnswers,
-                hasAnsweredMoldingQuestions: !!order.damage.moldingQuestionAnswers,
-                hasAnsweredCapabilityQuestions: !!order.damage.capabilityQuestionAnswers,
-                hasManuallySelectedParts: !!context.state.applicationUser.pageData["vehicle-parts"],
+                hasAnsweredPartQuestions: !!order.damage.partQuestionAnswers?.length,
+                hasAnsweredMoldingQuestions: !!order.damage.moldingQuestionAnswers?.length,
+                hasAnsweredCapabilityQuestions: !!order.damage.capabilityQuestionAnswers?.length,
+                hasManuallySelectedParts:
+                    !!context.state.applicationUser.pageData["vehicle-parts"]?.partsOrQuestions
+                        .length,
             },
             vehicle: {
                 year: vehicle.year,