diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 4ed5c8b03..20740bfb6 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -268,13 +268,7 @@ export default {
       return store.getters.vehicle.vin
     },
     getZipFromStore(){
-      var serviceZip = store.getters.order.serviceLocation.zipCode;
-
-      if (!serviceZip) {
-        serviceZip = store.getters.vehicle.registration.zipCode;
-      }
-
-      return serviceZip;
+      return store.getters.order.serviceLocation.zipCode;
     },
     attachCustomEvents() {
       this.prependActionToMethod(this, this.forwardButtonAction, () => {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index b1667eb4c..88a080d40 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -204,6 +204,8 @@ describe("Mutations", () => {
         // Arrange
         const storeState = state;
 
+        mutations.resetState(storeState);
+
         // Act
         mutations.updateStateWithOrderInformation(storeState, { 
           referralNumber: 123,
@@ -217,9 +219,11 @@ describe("Mutations", () => {
             carId: "C0000001",
             category: "CAR"
           },
-          glassToReplace: ["Windshield"],
-          isRepair: false,
-          numberOfChips: 0,
+          damage: {
+            glassToReplace: ["Windshield"],
+            isRepair: false,
+            numberOfChips: 0,
+          },
           parts: [],
           accountNumber: "123456789",
           insuranceInfo: {}