diff --git a/src/views/BrokeringRuns.vue b/src/views/BrokeringRuns.vue
index 5a76064..c92ed55 100644
--- a/src/views/BrokeringRuns.vue
+++ b/src/views/BrokeringRuns.vue
@@ -24,7 +24,7 @@
             <ion-list-header>{{ translate("Product Store") }}</ion-list-header>
             <ion-radio-group :value="currentEComStore.productStoreId" @ionChange="setEComStore($event)">
               <ion-item v-for="store in (userProfile ? userProfile.stores : [])" :key="store.productStoreId" lines="none">
-                <ion-radio :value="store.productStoreId">{{ store.storeName }}</ion-radio>
+                <ion-radio :value="store.productStoreId">{{ store.storeName || store.productStoreId }}</ion-radio>
               </ion-item>
             </ion-radio-group>
           </ion-list>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index cfaf11e..f501fb9 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -62,7 +62,7 @@
           </ion-card-content>
           <ion-item lines="none">
             <ion-select :label="translate('Select store')" interface="popover" :value="currentEComStore.productStoreId" @ionChange="setEComStore($event)">
-              <ion-select-option v-for="store in (userProfile ? userProfile.stores : [])" :key="store.productStoreId" :value="store.productStoreId" >{{ store.storeName }}</ion-select-option>
+              <ion-select-option v-for="store in (userProfile ? userProfile.stores : [])" :key="store.productStoreId" :value="store.productStoreId" >{{ store.storeName || store.productStoreId }}</ion-select-option>
             </ion-select>
           </ion-item>
         </ion-card>