diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 76e42bad9..28d3c5d94 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -755,13 +755,13 @@ export default {
         setMobileLocationInValid(isMobileLocationInValid) {
             this.isMobileAddressValid = !isMobileLocationInValid;
         },
-        displayMobileAddressQuestion() {
+        displayMobileAddressQuestion(openMobileLocation) {
             var mobileLocationQuestionsRef = this.$refs.mobileLocationQuestions;
             var isMobileAddressComplete = mobileLocationQuestionsRef?.isMobileAddressComplete;
             if (isMobileAddressComplete?.()) {
                 mobileLocationQuestionsRef.isMobileLocationOpened = false;
             } else {
-                mobileLocationQuestionsRef.isMobileLocationOpened = true;
+                mobileLocationQuestionsRef.isMobileLocationOpened = openMobileLocation;
             }
         },
         getIsMobileLocationOpened() {
@@ -791,9 +791,10 @@ export default {
                     this.selectedProvider = new Provider(
                         this.shopProviderData.mobileProviderNumber
                     );
-                    this.displayMobileAddressQuestion();
+                    this.displayMobileAddressQuestion(true);
                 } else {
                     this.selectedProvider = new Provider();
+                    this.displayMobileAddressQuestion(false);
                 }
             },
         },