diff --git a/src/components/FeaturePanel/ImagePane/PathsSvg.tsx b/src/components/FeaturePanel/ImagePane/PathsSvg.tsx
index 4fcdf5569..85965c553 100644
--- a/src/components/FeaturePanel/ImagePane/PathsSvg.tsx
+++ b/src/components/FeaturePanel/ImagePane/PathsSvg.tsx
@@ -86,7 +86,7 @@ type PathsProps = {
   size: Size;
 };
 export const Paths = ({ def, feature, size }: PathsProps) => {
-  const { preview } = useFeatureContext();
+  const { preview } = useFeatureContext() ?? {};
 
   return (
     isTag(def) && (
diff --git a/src/services/osmApi.ts b/src/services/osmApi.ts
index b706cfcb6..1f76e8d44 100644
--- a/src/services/osmApi.ts
+++ b/src/services/osmApi.ts
@@ -137,7 +137,8 @@ const getMemberFeatures = (members: Feature['members'], map) => {
 
 export const fetchWithMemberFeatures = async (apiId: OsmId) => {
   if (apiId.type !== 'relation') {
-    const wayOrNode = await fetchJson(getOsmUrl(apiId));
+    const wayOrNodeResponse = await fetchJson(getOsmUrl(apiId));
+    const wayOrNode = wayOrNodeResponse.elements[0];
     return addSchemaToFeature(osmToFeature(wayOrNode));
   }