diff --git a/src/mapper/package.json b/src/mapper/package.json
index 92f5cc863c..9a3752d2d4 100644
--- a/src/mapper/package.json
+++ b/src/mapper/package.json
@@ -52,6 +52,7 @@
 		"@turf/bbox": "^7.1.0",
 		"@turf/buffer": "^7.1.0",
 		"@turf/centroid": "^7.1.0",
+		"@turf/distance": "^7.2.0",
 		"@turf/helpers": "^7.1.0",
 		"@watergis/maplibre-gl-terradraw": "^0.8.1",
 		"drizzle-orm": "^0.35.3",
diff --git a/src/mapper/pnpm-lock.yaml b/src/mapper/pnpm-lock.yaml
index 636aedb6d1..af2ae8c663 100644
--- a/src/mapper/pnpm-lock.yaml
+++ b/src/mapper/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       '@turf/centroid':
         specifier: ^7.1.0
         version: 7.1.0
+      '@turf/distance':
+        specifier: ^7.2.0
+        version: 7.2.0
       '@turf/helpers':
         specifier: ^7.1.0
         version: 7.1.0
@@ -1447,9 +1450,18 @@ packages:
   '@turf/clone@7.1.0':
     resolution: {integrity: sha512-5R9qeWvL7FDdBIbEemd0eCzOStr09oburDvJ1hRiPCFX6rPgzcZBQ0gDmZzoF4AFcNLb5IwknbLZjVLaUGWtFA==}
 
+  '@turf/distance@7.2.0':
+    resolution: {integrity: sha512-HBjjXIgEcD/wJYjv7/6OZj5yoky2oUvTtVeIAqO3lL80XRvoYmVg6vkOIu6NswkerwLDDNT9kl7+BFLJoHbh6Q==}
+
   '@turf/helpers@7.1.0':
     resolution: {integrity: sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==}
 
+  '@turf/helpers@7.2.0':
+    resolution: {integrity: sha512-cXo7bKNZoa7aC7ydLmUR02oB3IgDe7MxiPuRz3cCtYQHn+BJ6h1tihmamYDWWUlPHgSNF0i3ATc4WmDECZafKw==}
+
+  '@turf/invariant@7.2.0':
+    resolution: {integrity: sha512-kV4u8e7Gkpq+kPbAKNC21CmyrXzlbBgFjO1PhrHPgEdNqXqDawoZ3i6ivE3ULJj2rSesCjduUaC/wyvH/sNr2Q==}
+
   '@turf/jsts@2.7.1':
     resolution: {integrity: sha512-+nwOKme/aUprsxnLSfr2LylV6eL6T1Tuln+4Hl92uwZ8FrmjDRCH5Bi1LJNVfWCiYgk8+5K+t2zDphWNTsIFDA==}
 
@@ -5144,11 +5156,29 @@ snapshots:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/distance@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@turf/invariant': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/helpers@7.1.0':
     dependencies:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/helpers@7.2.0':
+    dependencies:
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
+  '@turf/invariant@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/jsts@2.7.1':
     dependencies:
       jsts: 2.7.1
diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 991af37211..409747f4f8 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
+	import { distance } from '@turf/distance';
+	import type { Coord } from '@turf/helpers';
 	import { TaskStatusEnum, type ProjectData } from '$lib/types';
 	import { getEntitiesStatusStore } from '$store/entities.svelte.ts';
 	import { getAlertStore } from '$store/common.svelte.ts';
 	import { getTaskStore } from '$store/tasks.svelte.ts';
 	import { mapTask } from '$lib/db/events';
+	import type { SlDialog } from '@shoelace-style/shoelace';
 
 	type Props = {
 		isTaskActionModalOpen: boolean;
@@ -14,6 +17,9 @@
 
 	let { isTaskActionModalOpen, toggleTaskActionModal, selectedTab, projectData }: Props = $props();
 
+	let dialogRef: SlDialog | null = $state(null);
+	let toggleDistanceWarningDialog = $state(false);
+
 	const entitiesStore = getEntitiesStatusStore();
 	const alertStore = getAlertStore();
 	const taskStore = getTaskStore();
@@ -53,6 +59,54 @@
 		}
 	};
 
+	const handleMapFeature = () => {
+		/**
+		 	Logic to handle mapping feature in different scenarios:
+			1. No geolocation, no force geo constraint: allow mapping, ignore / do not show warning
+			2. No geolocation, force geo constraint: block mapping, show prompt to enable geolocation
+			3. Geolocation, no force geo constraint: show warning dialog if feature is far away
+			4. Geolocation, force geo constraint: block mapping if out of range else allow
+		**/
+		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
+		const coordFrom = entitiesStore.userLocationCoord;
+
+		// Run only if geo_restrict_force_error is set to true
+		if (projectData?.geo_restrict_force_error) {
+			// Geolocation not enabled, warn user
+			if (!coordFrom) {
+				alertStore.setAlert({
+					message:
+						'This project has distance constraint enabled. Please enable device geolocation for optimal functionality',
+					variant: 'warning',
+				});
+				return;
+			}
+
+			const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
+			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+				// Feature is far away from user, warn user
+				alertStore.setAlert({
+					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+					variant: 'warning',
+				});
+				return;
+			}
+		}
+
+		// Show warning dialog if geo_restrict_force_error is set to false, user location enabled and feature is far away
+		if (
+			!projectData?.geo_restrict_force_error &&
+			coordFrom &&
+			distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000 >
+				projectData?.geo_restrict_distance_meters
+		) {
+			toggleDistanceWarningDialog = true;
+			return;
+		}
+
+		mapFeature();
+	};
+
 	const navigateToEntity = () => {
 		if (!entitiesStore.toggleGeolocation) {
 			alertStore.setAlert({ message: 'Please enable geolocation to navigate to the entity.', variant: 'warning' });
@@ -138,11 +192,11 @@
 							size="small"
 							class="primary flex-grow"
 							onclick={() => {
-								mapFeature();
+								handleMapFeature();
 							}}
 							onkeydown={(e: KeyboardEvent) => {
 								if (e.key === 'Enter') {
-									mapFeature();
+									handleMapFeature();
 								}
 							}}
 							role="button"
@@ -158,3 +212,65 @@
 		</div>
 	</div>
 {/if}
+
+{#if entitiesStore.selectedEntityCoordinate?.coordinate && entitiesStore.userLocationCoord}
+	<hot-dialog
+		bind:this={dialogRef}
+		class="dialog-overview z-50 font-barlow font-regular"
+		open={toggleDistanceWarningDialog}
+		onsl-hide={() => {
+			toggleDistanceWarningDialog = false;
+		}}
+		noHeader
+	>
+		<div class="flex items-start flex-col">
+			<p class="text-base mb-5 text-gray-700">
+				Your are <b
+					>{(
+						distance(
+							entitiesStore.selectedEntityCoordinate?.coordinate as Coord,
+							entitiesStore.userLocationCoord as Coord,
+							{ units: 'kilometers' },
+						) * 1000
+					).toFixed(2)}m</b
+				> away from the feature. Are you sure you want to map this feature?
+			</p>
+			<div class="flex gap-2 ml-auto">
+				<sl-button
+					variant="default"
+					size="small"
+					class="secondary flex-grow"
+					onclick={() => (toggleDistanceWarningDialog = false)}
+					onkeydown={(e: KeyboardEvent) => {
+						if (e.key === 'Enter') {
+							toggleDistanceWarningDialog = false;
+						}
+					}}
+					role="button"
+					tabindex="0"
+				>
+					<span class="font-barlow font-medium text-sm">NO</span>
+				</sl-button>
+				<sl-button
+					variant="default"
+					size="small"
+					class="primary flex-grow"
+					onclick={() => {
+						mapFeature();
+						toggleDistanceWarningDialog = false;
+					}}
+					onkeydown={(e: KeyboardEvent) => {
+						if (e.key === 'Enter') {
+							mapFeature();
+							toggleDistanceWarningDialog = false;
+						}
+					}}
+					role="button"
+					tabindex="0"
+				>
+					<span class="font-barlow font-medium text-sm">YES</span>
+				</sl-button>
+			</div>
+		</div>
+	</hot-dialog>
+{/if}
diff --git a/src/mapper/src/lib/components/map/geolocation.svelte b/src/mapper/src/lib/components/map/geolocation.svelte
index bf81aed138..50e5aee182 100644
--- a/src/mapper/src/lib/components/map/geolocation.svelte
+++ b/src/mapper/src/lib/components/map/geolocation.svelte
@@ -244,6 +244,7 @@
 				on:click={() => {
 					entitiesStore.setToggleGeolocation(!entitiesStore.toggleGeolocation);
 					if (!entitiesStore.toggleGeolocation) {
+						entitiesStore.setUserLocationCoordinate(undefined);
 						exitNavigationMode();
 					}
 				}}
diff --git a/src/mapper/src/lib/types.ts b/src/mapper/src/lib/types.ts
index 66c2fb61a4..b428652d94 100644
--- a/src/mapper/src/lib/types.ts
+++ b/src/mapper/src/lib/types.ts
@@ -42,6 +42,8 @@ export interface ProjectData {
 	hashtags: string[];
 	tasks: ProjectTask[];
 	new_geom_type: NewGeomTypes;
+	geo_restrict_distance_meters: number;
+	geo_restrict_force_error: boolean;
 }
 
 export interface ZoomToTaskEventDetail {