diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index 4e6f2468..30be1bd5 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -165,7 +165,7 @@ export default {
     },
     mixins: [BaseFormMixin],
     async beforeRouteEnter(to, from, next) {
-        const serviceZipCode = useMainStore().order.serviceLocation.provider.address.zipCode;
+        const serviceZipCode = useMainStore().order.serviceLocation.zipCode;
         const customerZipCode = useMainStore().order.customer.address.zipCode;
         const zipCode = serviceZipCode || customerZipCode;
         const pageData = useMainStore().pageData(to.query.issPage);
@@ -297,7 +297,7 @@ export default {
             const provider = this.providers?.find((p) => p.providerNumber === newNumber);
             if (provider && this.dataLoaded) {
                 useMainStore().updateServiceLocation({
-                    zipCode: this.zipCode,
+                    zipCode: this.mapZipCode,
                     provider: {
                         providerNumber: provider?.providerNumber,
                         address: {