diff --git a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
index a5d763d..9c2e6df 100644
--- a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
@@ -67,6 +67,9 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     } else {
       evaluatedStyle = this.stylesCache["selected"];
     }    
+    if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
+      evaluatedStyle.setGeometry((feature) => this.geometry(feature));
+    } 
     return evaluatedStyle
   }
 
@@ -135,7 +138,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
       } else {
         evaluatedStyle = styleEntry;
       }
-      if(evaluatedStyle.geometry_ == null) {
+      if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
         evaluatedStyle.setGeometry((feature) => this.geometry(feature));
       } 
       return evaluatedStyle;