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 f6586d444..699452caf 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -257,21 +257,15 @@ export default {
             this.modal.closeModal();
         },
         async onSearchZip(event) {
-            this.isLoading = true;
             event.preventDefault();
-            if (this.localZipCode) {
-                this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location");
-            } else {
+            if (!this.localZipCode) {
                 this.zipCodeData = {
-                    containsMilitaryBase: false,
-                    isServiceable: false,
-                    isValid: false,
-                    state: "",
-                    zipCode: this.localZipCode,
-                    zipCodeCtu: "",
-                };
-                this.isLoading = false;
+                    isValid: false
+                }
+                return;
             }
+            this.isLoading = true;
+            this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location");
             // Add zipCode to zipCodeData as it does not come back from endpoint
             this.zipCodeData.zipCode = this.localZipCode;
             if (this.zipCodeData.isValid) {