diff --git a/src/components/map/ClaimDrawerImages.tsx b/src/components/map/ClaimDrawerImages.tsx
index a980b6b6..25452d7f 100644
--- a/src/components/map/ClaimDrawerImages.tsx
+++ b/src/components/map/ClaimDrawerImages.tsx
@@ -5,10 +5,10 @@ import {
 	Group,
 	Image,
 	Progress,
-	rem,
 	Stack,
 	Text,
 	Tooltip,
+	rem,
 } from '@mantine/core';
 import {
 	Dropzone,
@@ -90,7 +90,8 @@ export function ClaimDrawerImages({ t, ...props }: ClaimDrawerImagesProps) {
 		});
 	};
 
-	if (props.images.length == 0 && !props.editable) return <></>;
+	// if(!props.images || props.images?.length)
+	if (props.images?.length == 0 && !props.editable) return <></>;
 
 	return (
 		<Carousel
@@ -110,7 +111,7 @@ export function ClaimDrawerImages({ t, ...props }: ClaimDrawerImagesProps) {
 			h={'auto'}
 			w="100%"
 		>
-			{props.images.map((img, i) => {
+			{props.images?.map((img, i) => {
 				return (
 					<CarouselSlide key={img.id} w="100%" h="100%">
 						{props.editable && (
diff --git a/src/pages/map/edit/index.tsx b/src/pages/map/edit/index.tsx
index 111fcf00..639b0629 100644
--- a/src/pages/map/edit/index.tsx
+++ b/src/pages/map/edit/index.tsx
@@ -16,7 +16,6 @@ import {
 	MenuItem,
 	MenuTarget,
 	NumberInput,
-	rem,
 	ScrollAreaAutosize,
 	Select,
 	Switch,
@@ -25,9 +24,10 @@ import {
 	TableTd,
 	TableTr,
 	Text,
-	Textarea,
 	TextInput,
+	Textarea,
 	Tooltip,
+	rem,
 } from '@mantine/core';
 import { useClipboard, useDebouncedState } from '@mantine/hooks';
 import {
@@ -52,10 +52,10 @@ import {
 import { useEffect, useState } from 'react';
 
 import { useContextMenu } from '@/components/ContextMenu';
+import Page from '@/components/Page';
 import { ClaimDrawerImages } from '@/components/map/ClaimDrawerImages';
 import Map from '@/components/map/Map';
 import { MapContextMenu } from '@/components/map/MapContextMenu';
-import Page from '@/components/Page';
 import { useAccessToken } from '@/hooks/useAccessToken';
 import { usePermissions } from '@/hooks/usePermissions';
 import { useUser } from '@/hooks/useUser';
@@ -839,7 +839,7 @@ const ClaimEditPage: NextPage = () => {
 									setSelected(e.features[0]);
 								});
 								map.on('draw.selectionchange', (e) => {
-									if (e.points.length > 0) return;
+									if (e.points?.length > 0) return;
 									setSelected(e.features[0]);
 								});