diff --git a/src/components/infrastructure/tollHouseMap/PointsOnMap/index.jsx b/src/components/infrastructure/tollHouseMap/PointsOnMap/index.jsx
index 05b4d03..8283bbf 100644
--- a/src/components/infrastructure/tollHouseMap/PointsOnMap/index.jsx
+++ b/src/components/infrastructure/tollHouseMap/PointsOnMap/index.jsx
@@ -20,30 +20,50 @@ const PointsOnMap = ({ data, isCluster }) => {
     };
 
     const markers = useMemo(() => {
-        return data.map(({ id, lat, lng, step }) => (
-            <CircleMarker
-                key={id}
-                center={L.latLng(Number(lat), Number(lng))}
-                radius={8}
-                eventHandlers={{
-                    click: () => {
-                        openDialog();
-                        setSelectedId(id);
-                    },
-                }}
-                color={getMarkerColor(Number(status))}
-            />
-        ));
+        return data.map(({ id, lat, lng, step }) => {
+            if (!lat && !lng) return;
+            return (
+                <CircleMarker
+                    key={id}
+                    center={L.latLng(Number(lat), Number(lng))}
+                    radius={8}
+                    eventHandlers={{
+                        click: () => {
+                            openDialog();
+                            setSelectedId(id);
+                        },
+                    }}
+                    color={getMarkerColor(Number(status))}
+                />
+            );
+        });
     }, [data, theme]);
 
     useEffect(() => {
-        if (data.length === 0) return;
+        if (data.length === 0) {
+            // fly to Iran
+            map.flyTo([32.4279, 53.688], 6, { duration: 0.7 });
+            return;
+        }
 
-        const bounds = L.latLngBounds(
-            data.map(({ lat, lng }) => {
-                return L.latLng(Number(lat), Number(lng));
-            })
-        );
+        // ساختن bounds با حذف مواردی که lat/lng ندارند
+        const validPoints = data
+            .filter(({ lat, lng }) => lat && lng)
+            .map(({ lat, lng }) => L.latLng(Number(lat), Number(lng)));
+
+        if (validPoints.length === 0) {
+            // اگر هیچ مختصات معتبری نبود → ایران
+            map.flyTo([32.4279, 53.688], 6, { duration: 0.7 });
+            return;
+        }
+
+        const bounds = L.latLngBounds(validPoints);
+
+        if (!bounds.isValid()) {
+            // اگر bounds معتبر نبود → fallback روی ایران
+            map.flyTo([32.4279, 53.688], 6, { duration: 0.7 });
+            return;
+        }
 
         map.flyToBounds(bounds, { duration: 0.7 });
     }, [data]);