diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1c35f96fa..e06604a4a 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -149,10 +149,10 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
+            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
             return (
                 store.getters.damage.isRepair != null &&
-                store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
-                Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0
+                vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
             );
         },
         async forwardButtonAction() {