diff --git a/src/components/ProductStorePopover.vue b/src/components/ProductStorePopover.vue
index 75f1090..f4da6ba 100644
--- a/src/components/ProductStorePopover.vue
+++ b/src/components/ProductStorePopover.vue
@@ -118,6 +118,8 @@ export default defineComponent({
 
       // if we does not get shopify shop id for the store then not making product store as primary
       if(!shopifyShopId) {
+        showToast(translate('Failed to make product store primary due to missing Shopify shop'))
+        emitter.emit('dismissLoader')
         return;
       }
 
diff --git a/src/locales/en.json b/src/locales/en.json
index ff9b669..6aff268 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -144,6 +144,7 @@
   "Failed to find the facility locations": "Failed to find the facility locations",
   "Failed to make product store as primary.": "Failed to make product store as primary.",
   "Failed to make product store primary.": "Failed to make product store primary.",
+  "Failed to make product store primary due to missing Shopify shop": "Failed to make product store primary due to missing Shopify shop",
   "Failed to regenerate latitude and longitude for the facility.": "Failed to regenerate latitude and longitude for the facility.",
   "Failed to rename facility.": "Failed to rename facility.",
   "Failed to remove facility latitude and longitude.": "Failed to remove facility latitude and longitude.",
diff --git a/src/views/FacilityDetails.vue b/src/views/FacilityDetails.vue
index 15616f3..8c2cfff 100644
--- a/src/views/FacilityDetails.vue
+++ b/src/views/FacilityDetails.vue
@@ -172,7 +172,7 @@
             </ion-card-header>
             <ion-item v-for="store in facilityProductStores" :key="store.productStoreId">
               <ion-label>{{ getProductStore(store.productStoreId)?.storeName }}</ion-label>
-              <ion-badge slot="end" v-if="shopifyShopIdForProductStore(store.productStoreId) === current.primaryFacilityGroupId">{{ translate("primary store") }}</ion-badge>
+              <ion-badge slot="end" v-if="shopifyShopIdForProductStore(store.productStoreId) !== '' && shopifyShopIdForProductStore(store.productStoreId) === current.primaryFacilityGroupId">{{ translate("primary store") }}</ion-badge>
               <ion-button slot="end" fill="clear" color="medium" @click="productStorePopover($event, store)">
                 <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
               </ion-button>