diff --git a/src/components/ProductStorePopover.vue b/src/components/ProductStorePopover.vue
index 0d372f9..79cff3f 100644
--- a/src/components/ProductStorePopover.vue
+++ b/src/components/ProductStorePopover.vue
@@ -1,7 +1,8 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-list-header>{{ getProductStore(currentProductStore.productStoreId).storeName }}</ion-list-header>
+      <ion-list-header>
+        {{ getProductStore(currentProductStore.productStoreId).storeName || currentProductStore.productStoreId }}</ion-list-header>
       <ion-item button @click="togglePrimary()">
         {{ translate("Primary") }}
         <ion-icon slot="end" :color="current.primaryFacilityGroupId === shopifyShopIdForProductStore(currentProductStore.productStoreId) ? 'warning' : ''" :icon="current.primaryFacilityGroupId === shopifyShopIdForProductStore(currentProductStore.productStoreId) ? star : starOutline" />
diff --git a/src/views/AddFacilityConfig.vue b/src/views/AddFacilityConfig.vue
index e915458..68477de 100644
--- a/src/views/AddFacilityConfig.vue
+++ b/src/views/AddFacilityConfig.vue
@@ -22,7 +22,7 @@
             <ion-list>
               <ion-item v-for="store in selectedProductStores" :key="store.productStoreId">
                 <ion-label>
-                  <h2>{{ getProductStore(store.productStoreId)?.storeName }}</h2>
+                  <h2>{{ getProductStore(store.productStoreId)?.storeName || store.productStoreId }}</h2>
                 </ion-label>
                 <ion-badge v-if="store.productStoreId === primaryFacilityGroupId">
                   {{ translate("primary store") }}