diff --git a/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/src/Components/Map/Subcomponents/ItemFormPopup.tsx
index cc348d66..8714772c 100644
--- a/src/Components/Map/Subcomponents/ItemFormPopup.tsx
+++ b/src/Components/Map/Subcomponents/ItemFormPopup.tsx
@@ -82,7 +82,7 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
             map.closePopup();
         }
         else {
-            const item = items.find(i => i.user_created.id === user?.id && i.layer?.itemType.name === props.layer.itemType.name);
+            const item = items.find(i => i.user_created?.id === user?.id && i.layer?.itemType.name === props.layer.itemType.name);
             console.log(item);
             
             const uuid = crypto.randomUUID();
diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx
index 8c4a709a..bee6cdee 100644
--- a/src/Components/Map/hooks/usePermissions.tsx
+++ b/src/Components/Map/hooks/usePermissions.tsx
@@ -77,7 +77,7 @@ function usePermissionsManager(initialPermissions: Permission[]): {
             p.permissions._and.some(condition => 
               condition.user_created &&
               condition.user_created._eq === "$CURRENT_USER" &&
-              item.user_created.id === user?.id
+              item.user_created?.id === user?.id
             )
           )
         );