diff --git a/lib/src/Components/Map/hooks/useSelectPosition.tsx b/lib/src/Components/Map/hooks/useSelectPosition.tsx
index c0e0b8e0..98c2c8e4 100644
--- a/lib/src/Components/Map/hooks/useSelectPosition.tsx
+++ b/lib/src/Components/Map/hooks/useSelectPosition.tsx
@@ -140,7 +140,7 @@ function useSelectPositionManager(): {
 
       if (result.success && result.data) {
         // Find the layer object by ID from server response
-        const layer = layers.find((l) => l.id === (result.data.layer as unknown as string))
+        const layer = layers.find((l) => l.id === (result.data!.layer as unknown as string))
         const itemWithLayer = { ...result.data, layer }
         updateItem(itemWithLayer)
         await linkItem(updatedItem.id)
@@ -176,7 +176,7 @@ function useSelectPositionManager(): {
 
     if (result.success && result.data) {
       // Find the layer object by ID from server response
-      const layer = layers.find((l) => l.id === (result.data.layer as unknown as string))
+      const layer = layers.find((l) => l.id === (result.data!.layer as unknown as string))
       const itemWithLayer = { ...result.data, layer }
       updateItem(itemWithLayer)
     }
@@ -202,7 +202,7 @@ function useSelectPositionManager(): {
 
         if (result.success && result.data) {
           // Find the layer object by ID from server response
-          const layer = layers.find((l) => l.id === (result.data.layer as unknown as string))
+          const layer = layers.find((l) => l.id === (result.data!.layer as unknown as string))
           const itemWithLayer = { ...result.data, layer }
           updateItem(itemWithLayer)
         }
diff --git a/lib/src/Components/Profile/itemFunctions.ts b/lib/src/Components/Profile/itemFunctions.ts
index 3129503c..44e5940c 100644
--- a/lib/src/Components/Profile/itemFunctions.ts
+++ b/lib/src/Components/Profile/itemFunctions.ts
@@ -105,7 +105,7 @@ export const submitNewItem = async (
 
   if (result.success && result.data) {
     // Find the layer object by ID from server response
-    const layerForItem = layers.find((l) => l.id === result.data.layer) || layer
+    const layerForItem = layers.find((l) => l.id === result.data!.layer) || layer
     const itemWithLayer = { ...result.data, layer: layerForItem }
     addItem(itemWithLayer)
     await linkItem(uuid)