diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index ebbc1334..925221dc 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -369,11 +369,10 @@ export default {
             return useMainStore().order.serviceLocation.city;
         },
         getServiceStateFromStore() {
-            return useMainStore().order.serviceLocation.state;
+            return useMainStore().order.serviceLocation.state || useMainStore().order.customer.address.state;
         },
         getServiceZipCodeFromStore() {
-            return useMainStore().order.customer.address.zipCode;
-            // return useMainStore().order.serviceLocation.zipCode;
+            return useMainStore().order.serviceLocation.zipCode || useMainStore().order.customer.address.zipCode;
         },
         getIsVehicleProtectedFromStore() {
             return useMainStore().order.serviceLocation.isVehicleProtected;