diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 29888c9c8..dc1cf0a71 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -476,18 +476,24 @@ export default {
             let currentPartsOrQuestions = null;
 
             if (
-                currentPage !== fmgPageValues.CAPABILITY_QUESTIONS &&
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS) &&
                 !!pageDataCapabilityQuestions
             ) {
                 currentPartsOrQuestions = pageDataCapabilityQuestions?.partsOrQuestions;
             } else if (
-                currentPage !== fmgPageValues.MOLDING_QUESTIONS &&
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS) &&
                 !!pageDataMoldingQuestions
             ) {
                 currentPartsOrQuestions = pageDataMoldingQuestions?.partsOrQuestions;
-            } else if (currentPage !== fmgPageValues.VEHICLE_PARTS && !!pageDataVehicleParts) {
+            } else if (
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS) &&
+                !!pageDataVehicleParts
+            ) {
                 currentPartsOrQuestions = pageDataVehicleParts?.partsOrQuestions;
-            } else if (currentPage !== fmgPageValues.PARTS_QUESTIONS && !!pageDataPartQuestions) {
+            } else if (
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.PARTS_QUESTIONS) &&
+                !!pageDataPartQuestions
+            ) {
                 currentPartsOrQuestions = pageDataPartQuestions?.partsOrQuestions;
             }