diff --git a/web/src/components/settings/PolygonCanvas.tsx b/web/src/components/settings/PolygonCanvas.tsx
index 3ba059d78c..e2809d332f 100644
--- a/web/src/components/settings/PolygonCanvas.tsx
+++ b/web/src/components/settings/PolygonCanvas.tsx
@@ -262,7 +262,7 @@ export function PolygonCanvas({
   };
 
   useEffect(() => {
-    if (activePolygonIndex === undefined || !polygons) {
+    if (activePolygonIndex === undefined || !polygons?.length) {
       return;
     }
 
@@ -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),