diff --git a/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
index 534336a3..cbc9ee71 100644
--- a/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
+++ b/lib/src/Components/Map/Subcomponents/ItemFormPopup.tsx
@@ -127,14 +127,14 @@ export function ItemFormPopup(props: Props) {
         const itemWithLayer = {
           ...result.data,
           layer: popupForm.layer,
-          user_created: user ?? undefined,
+          user_created: formItem.user_created,
         }
         updateItem(itemWithLayer)
       }
 
       return result.success
     },
-    [popupForm, handleApiOperation, updateItem, user],
+    [popupForm, handleApiOperation, updateItem],
   )
 
   // Create new item or update existing user profile
diff --git a/lib/src/Components/Map/hooks/useSelectPosition.tsx b/lib/src/Components/Map/hooks/useSelectPosition.tsx
index 61733c98..3eb6dd51 100644
--- a/lib/src/Components/Map/hooks/useSelectPosition.tsx
+++ b/lib/src/Components/Map/hooks/useSelectPosition.tsx
@@ -144,7 +144,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 itemWithLayer = { ...result.data, layer, user_created: user ?? undefined }
+        const itemWithLayer = { ...result.data, layer, user_created: updatedItem.user_created }
         updateItem(itemWithLayer)
         await linkItem(updatedItem.id)
         setSelectPosition(null)
@@ -205,7 +205,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 itemWithLayer = { ...result.data, layer, user_created: user ?? undefined }
+          const itemWithLayer = { ...result.data, layer, user_created: markerClicked.user_created }
           updateItem(itemWithLayer)
         }
       }
diff --git a/lib/src/Components/Profile/itemFunctions.ts b/lib/src/Components/Profile/itemFunctions.ts
index d04ae117..b668bd48 100644
--- a/lib/src/Components/Profile/itemFunctions.ts
+++ b/lib/src/Components/Profile/itemFunctions.ts
@@ -139,7 +139,7 @@ export const linkItem = async (id: string, item: Item, updateItem, user) => {
       ...result.data,
       layer,
       relations: newRelations,
-      user_created: user ?? undefined,
+      user_created: item.user_created,
     }
     updateItem(itemWithLayer)
   }
@@ -163,7 +163,7 @@ export const unlinkItem = async (id: string, item: Item, updateItem, user) => {
   if (result.success && result.data) {
     // Find the layer object by ID from server response or use existing layer
     const layer = item.layer
-    const itemWithLayer = { ...result.data, layer, user_created: user ?? undefined }
+    const itemWithLayer = { ...result.data, layer, user_created: item.user_created }
     updateItem(itemWithLayer)
   }
 }
@@ -308,7 +308,7 @@ export const onUpdateItem = async (
         layer: item.layer,
         markerIcon: state.marker_icon,
         gallery: state.gallery,
-        user_created: user ?? undefined,
+        user_created: item.user_created,
       }
       updateItem(itemWithLayer)
       navigate(`/item/${item.id}${params && '?' + params}`)