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 6597d98f8..58871decc 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -291,7 +291,7 @@ export default {
                         this.$store.getters.order.vehicle.carId,
                         "service-location"
                     );
-                    if (!closestShops || closestShops.providers?.length === 0) {
+                    if (!closestShops || closestShops.inShopProviders?.length === 0) {
                         this.isLoading = false;
                         this.displayNoServiceAlert = true;
                         return null;
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 90cd9160c..4521a6e2f 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -496,7 +496,10 @@ export default {
                     { zip: this.serviceZipCode, carId: this.carId },
                     "vehicle"
                 );
-                if (!closestShops?.data?.providers || closestShops.data.providers.length === 0) {
+                if (
+                    !closestShops?.data?.inShopProviders ||
+                    closestShops.data.inShopProviders.length === 0
+                ) {
                     this.displayNoServiceAlert = true;
                     if (store.getters.externalParameterState?.isExternalParameter) {
                         return baseMixin.methods.ResetExternalParamsAndHideModal();