diff --git a/frontend/src/containers/map/content/map/popup/boundaries/index.tsx b/frontend/src/containers/map/content/map/popup/boundaries/index.tsx
index 57139f78..2bc8b0b2 100644
--- a/frontend/src/containers/map/content/map/popup/boundaries/index.tsx
+++ b/frontend/src/containers/map/content/map/popup/boundaries/index.tsx
@@ -62,7 +62,7 @@ const BoundariesPopup: FCWithMessages<{ layerId: number }> = ({ layerId }) => {
         placeholderData: { data: {} },
         select: ({ data }) => ({
           source: (data.attributes as LayerTyped)?.config?.source,
-          environment: data.attributes?.environment?.data.attributes.slug,
+          environment: data.attributes?.environment?.data?.attributes.slug,
         }),
       },
     }
diff --git a/frontend/src/containers/map/sidebar/main-panel/panels/details/widgets/habitat/index.tsx b/frontend/src/containers/map/sidebar/main-panel/panels/details/widgets/habitat/index.tsx
index f9ecf67d..5aed116a 100644
--- a/frontend/src/containers/map/sidebar/main-panel/panels/details/widgets/habitat/index.tsx
+++ b/frontend/src/containers/map/sidebar/main-panel/panels/details/widgets/habitat/index.tsx
@@ -116,12 +116,12 @@ const HabitatWidget: FCWithMessages<HabitatWidgetProps> = ({ location }) => {
               )?.attributes;
             }
 
-            const metadata = habitatMetadatas?.find(({ slug }) => slug === habitat.slug);
+            const metadata = habitatMetadatas?.find(({ slug }) => slug === habitat?.slug);
 
             return {
-              title: habitat.name,
-              slug: habitat.slug,
-              background: HABITAT_CHART_COLORS[habitat.slug],
+              title: habitat?.name,
+              slug: habitat?.slug,
+              background: HABITAT_CHART_COLORS[habitat?.slug],
               totalArea: stats.total_area,
               protectedArea: stats.protected_area,
               info: metadata?.info,