diff --git a/src/Components/Map/Layer.tsx b/src/Components/Map/Layer.tsx
index c2c27526..b091c5ff 100644
--- a/src/Components/Map/Layer.tsx
+++ b/src/Components/Map/Layer.tsx
@@ -133,14 +133,14 @@ export const Layer = ({
         <>
             {items &&
                 items.
-                    filter(item => item[itemTextField]).
                     filter(item => item.layer?.name === name)?.
                     filter(item =>
                         filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.id.toLocaleLowerCase() === tag.id.toLocaleLowerCase())))?.
                     filter(item => item.layer && isLayerVisible(item.layer)).
                     map((item: Item) => {                      
                         if (getValue(item, itemLongitudeField) && getValue(item, itemLatitudeField)) {
-                            item[itemTextField] = getValue(item, itemTextField);
+                            if(item[itemTextField]) item[itemTextField] = getValue(item, itemTextField);
+                            else item[itemTextField] = "";
                             if (item?.tags) {
                                 item[itemTextField] = item[itemTextField] + '\n\n';
                                 item.tags.map(tag => {
diff --git a/src/Components/Map/hooks/useTags.tsx b/src/Components/Map/hooks/useTags.tsx
index 0ef7cf5b..78b10d49 100644
--- a/src/Components/Map/hooks/useTags.tsx
+++ b/src/Components/Map/hooks/useTags.tsx
@@ -92,7 +92,7 @@ function useTagsManager(initialTags: Tag[]): {
 
   const getItemTags = useCallback((item: Item) => {
     const text = item?.layer?.itemTextField && item ? getValue(item, item.layer?.itemTextField) : undefined;
-    const itemTagStrings = text.toLocaleLowerCase().match(hashTagRegex);
+    const itemTagStrings = text?.toLocaleLowerCase().match(hashTagRegex);
     const itemTags: Tag[] = [];
     itemTagStrings?.map(tag => {
       if (tags.find(t => t.id === tag.slice(1))) {