diff --git a/lib/src/Components/Item/PopupView.tsx b/lib/src/Components/Item/PopupView.tsx
index 7c096262..98640f38 100644
--- a/lib/src/Components/Item/PopupView.tsx
+++ b/lib/src/Components/Item/PopupView.tsx
@@ -173,7 +173,7 @@ export const PopupView = ({ children }: { children?: React.ReactNode }) => {
           </ItemViewPopup>
 
           <Tooltip offset={[0, -38]} direction='top'>
-            {item.name || item.layer?.item_default_name}
+            {item.name ?? item.layer?.item_default_name}
           </Tooltip>
         </Marker>
       </TemplateItemContext.Provider>
diff --git a/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
index cbc9ee71..9e0ab2a1 100644
--- a/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
+++ b/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
@@ -146,7 +146,7 @@ export function ItemFormPopup(props: Props) {
         (i) => i.user_created?.id === user?.id && i.layer === popupForm.layer,
       )
 
-      const itemName = formItem.name || user?.first_name
+      const itemName = formItem.name ?? user?.first_name
       if (!itemName) {
         toast.error('Name must be defined')
         return false
diff --git a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView/ItemAvatar.tsx b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView/ItemAvatar.tsx
index 0a364d32..e589d490 100644
--- a/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView/ItemAvatar.tsx
+++ b/lib/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView/ItemAvatar.tsx
@@ -29,7 +29,7 @@ export function ItemAvatar({ item, big = false }: ItemAvatarProps) {
         <img
           className='tw:w-full tw:h-full tw:object-cover tw:rounded-full tw:border-white'
           src={avatar}
-          alt={item.name + ' logo'}
+          alt={item.name ?? '' + ' logo'}
           onLoad={() => setImageLoaded(true)}
           onError={() => setImageLoaded(false)}
           style={{ display: imageLoaded ? 'block' : 'none' }}
diff --git a/lib/src/Components/Profile/Subcomponents/LinkedItemsHeaderView.tsx b/lib/src/Components/Profile/Subcomponents/LinkedItemsHeaderView.tsx
index 29e4b9f3..491ddbeb 100644
--- a/lib/src/Components/Profile/Subcomponents/LinkedItemsHeaderView.tsx
+++ b/lib/src/Components/Profile/Subcomponents/LinkedItemsHeaderView.tsx
@@ -40,7 +40,7 @@ export function LinkedItemsHeaderView({
               <img
                 className={'tw:w-10 tw:inline tw:rounded-full'}
                 src={avatar}
-                alt={item.name + ' logo'}
+                alt={item.name ?? '' + ' logo'}
               />
             )}
             <div className={`${avatar ? 'tw:ml-2' : ''} tw:overflow-hidden`}>