diff --git a/web/src/components/settings/PolygonCanvas.tsx b/web/src/components/settings/PolygonCanvas.tsx
index 9adc2f09e..3ba059d78 100644
--- a/web/src/components/settings/PolygonCanvas.tsx
+++ b/web/src/components/settings/PolygonCanvas.tsx
@@ -270,7 +270,7 @@ export function PolygonCanvas({
     const activePolygon = updatedPolygons[activePolygonIndex];
 
     // add default points order for already completed polygons
-    if (!activePolygon.pointsOrder && activePolygon.isFinished) {
+    if (!activePolygon?.pointsOrder && activePolygon?.isFinished) {
       updatedPolygons[activePolygonIndex] = {
         ...activePolygon,
         pointsOrder: activePolygon.points.map((_, index) => index),
diff --git a/web/src/components/settings/ZoneEditPane.tsx b/web/src/components/settings/ZoneEditPane.tsx
index cfbf747ce..ec12eaeec 100644
--- a/web/src/components/settings/ZoneEditPane.tsx
+++ b/web/src/components/settings/ZoneEditPane.tsx
@@ -271,7 +271,7 @@ export default function ZoneEditPane({
     mode: "onBlur",
     defaultValues: {
       name: polygon?.name ?? "",
-      friendly_name: polygon?.friendly_name ?? "",
+      friendly_name: polygon?.friendly_name ?? polygon?.name,
       inertia:
         polygon?.camera &&
         polygon?.name &&