diff --git a/src/UI/Map/PointRenderingLayer.ts b/src/UI/Map/PointRenderingLayer.ts
index a0153389a..da2fdac74 100644
--- a/src/UI/Map/PointRenderingLayer.ts
+++ b/src/UI/Map/PointRenderingLayer.ts
@@ -231,7 +231,8 @@ export class PointRenderingLayer {
         let store: Store<Record<string, string>>
         if (this._fetchStore) {
             store = this._fetchStore(feature.properties.id)
-        } else {
+        }
+        if(!store){
             store = new ImmutableStore(<OsmTags>feature.properties)
         }
         const { html, iconAnchor } = this._config.RenderIcon(store, { metatags: this._metatags })