diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a4d3250d0..1a71f9dbd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -108,9 +108,9 @@
                         :appointmentType="appointmentType"
                         :modelValue="{
                             zipCode: zipCode,
-                            providerNumber: selectedProvider?.providerNumber,
+                            state: state,
                         }"
-                        :preselectedProviderNumber="selectedProvider?.providerNumber"
+                        :preSelectedProviderNumber="selectedProvider?.providerNumber"
                         :shopProviderData="shopProviderData"
                         :isServiceableInshop="isServiceableInshop"
                         @updated-serviceability="setServiceabilityDetails"
@@ -1171,25 +1171,10 @@ export default {
             let provider = this.shopProviderData?.shopProviders?.find(
                 (p) => p.providerNumber === providerObject?.providerNumber
             );
-            if (!provider && this.shopProviderData?.shopProviders?.length > 0) {
-                provider = this.shopProviderData.shopProviders[0];
-            }
             this.selectedProvider = provider;
-            if (provider && provider.address) {
-                this.zipCode = provider.address.zipCode;
-                this.state = provider.address.state;
-            }
-            if (
-                !this.selectedProvider ||
-                !this.shopProviderData?.shopProviders?.some(
-                    (p) => p.providerNumber === this.selectedProvider?.providerNumber
-                )
-            ) {
-                this.selectedProvider = this.shopProviderData?.shopProviders?.[0];
-            }
             if (providerObject && providerObject.address) {
-                this.zipCode = providerObject.address.zipCode;
-                this.state = providerObject.address.state;
+                this.zipCode = providerObject.searchedZip;
+                this.state = providerObject.searchedState;
             }
         },
         setZipcodeCtu(zipcodeCtu) {
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 3171ea8d9..22e17e3b7 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
-    monospace;
+$font-family-monospace:
+    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;