diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6b059079f..e6613cda8 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -190,10 +190,10 @@ export default {
             },
         },
         showMilitaryZipAlert() {
-            return (
-                this.zipContainsMilitaryBase &&
-                (this.isZipServiceableMobile == null || this.isZipServiceableMobile === true)
-            );
+            const isZipServiceableMobile =
+                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+
+            return this.zipContainsMilitaryBase && isZipServiceableMobile;
         },
     },
     methods: {
diff --git a/src/layouts/service-location/service-type-question/service-type-question.vue b/src/layouts/service-location/service-type-question/service-type-question.vue
index b74ad989f..d8ba9e864 100644
--- a/src/layouts/service-location/service-type-question/service-type-question.vue
+++ b/src/layouts/service-location/service-type-question/service-type-question.vue
@@ -55,8 +55,13 @@ export default {
             return filteredAnswers;
         },
         serviceability() {
-            const mobileAvailable =
-                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            let mobileAvailable;
+            if (this.IsRecalibrationServiceableMobile == null) {
+                mobileAvailable = this.isGlassServiceableMobile;
+            } else {
+                mobileAvailable = this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            }
+
             const inshopAvailable =
                 this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
 
@@ -87,6 +92,8 @@ export default {
             handler(newValue) {
                 if (newValue == "MobileOnly") {
                     this.selectedValues = "Mobile";
+                } else {
+                    this.selectedValues = null;
                 }
             },
         },
diff --git a/src/store/index.js b/src/store/index.js
index 413d2f8b0..24d9e5b84 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -43,6 +43,7 @@ const getDefaultState = () => {
                 state: null,
                 zipCode: null,
                 zipCodeCtu: null,
+                serviceType: null,
             },
             customer: {
                 emailAddress: null,