diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 3cc6b1149..85f277482 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -80,7 +80,10 @@ export default {
   },
   methods: {
     arePagePrerequisitesValid() {
-      return store.getters.damage.isRepair != null;
+      if(store.getters.damage.isRepair != null){
+        return true;
+      }
+      return false; 
     },
     backButtonAction() {
       // route to move backwards
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 42e150c90..23d317815 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -155,7 +155,10 @@ export default {
   },
   methods: {
     arePagePrerequisitesValid() {
-      return store.getters.vehicle.carId != null;
+      if (store.getters.vehicle.carId) {
+        return true;
+      }
+      return false;
     },
 
     attachCustomEvents(){
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index e769c4290..309e74863 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -76,7 +76,10 @@ export default {
       );
     },
     arePagePrerequisitesValid() {
-      return store.getters.vehicle.year != null;
+      if (store.getters.vehicle.year){
+        return true;
+      }
+      return false;
     },
   },