diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index 31f304594..e878e878c 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -222,6 +222,12 @@ export default {
             this.pushEventToGA(this.GaCategories.SERVICE_LOCATION, this.GaActions.MORE_LOCATIONS_CLICKED, joinedShops, true);
         },
         onModalOpened() {
+            // Reset local state from parent
+            this.localShopProviderData = this.shopProviderDataFromParent;
+            this.localSelectedProviderNumber = this.selectedProviderNumberFromParent;
+            this.localZipCode = this.zipCodeFromParent;
+            this.answers = [];
+
             const selectedProviderNumberFromParentIndex = this.shopProviders.findIndex(
                 (provider) => provider.providerNumber == this.selectedProviderNumberFromParent
             );
@@ -232,10 +238,8 @@ export default {
                 this.indexOfLastShopToBeDisplayed = 3;
             }
 
-            this.localShopProviderData = this.shopProviderDataFromParent;
-            this.answers = [];
             this.updateShopsForZip(this.localZipCode);
-            this.localSelectedProviderNumber = this.selectedProviderNumberFromParent;
+            
         },
         closeModal() {
             this.modal.closeModal();