diff --git a/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/src/Components/Map/Subcomponents/ItemFormPopup.tsx
index ef191276..5a2ad79d 100644
--- a/src/Components/Map/Subcomponents/ItemFormPopup.tsx
+++ b/src/Components/Map/Subcomponents/ItemFormPopup.tsx
@@ -53,6 +53,13 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
     })
     formItem.position = { type: 'Point', coordinates: [props.position.lng, props.position.lat] }
     evt.preventDefault()
+
+    const name = formItem.name ? formItem.name : user?.first_name
+    if (!name) {
+      toast.error('Name is must be defined')
+      return
+    }
+
     setSpinner(true)
 
     formItem.text &&
@@ -98,8 +105,8 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
         ;(!props.layer.userProfileLayer || !item) &&
           (await props.layer.api?.createItem!({
             ...formItem,
+            name,
             id: uuid,
-            name: formItem.name ? formItem.name : user?.first_name,
           }))
         success = true
         // eslint-disable-next-line no-catch-all/no-catch-all
diff --git a/src/Components/Map/hooks/useItems.tsx b/src/Components/Map/hooks/useItems.tsx
index bf8779fe..0fb1af78 100644
--- a/src/Components/Map/hooks/useItems.tsx
+++ b/src/Components/Map/hooks/useItems.tsx
@@ -82,7 +82,6 @@ function useItemsManager(initialItems: Item[]): {
       },
     })
     result.map((item) => {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       dispatch({ type: 'ADD', item: { ...item, layer } })
       return null
     })
diff --git a/src/types/LayerProps.d.ts b/src/types/LayerProps.d.ts
index 44f55a95..9c720bc4 100644
--- a/src/types/LayerProps.d.ts
+++ b/src/types/LayerProps.d.ts
@@ -18,8 +18,7 @@ export interface LayerProps {
   markerShape: string
   markerDefaultColor: string
   markerDefaultColor2?: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  api?: ItemsApi<any>
+  api?: ItemsApi<Item>
   itemType: ItemType
   userProfileLayer?: boolean
   customEditLink?: string