diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index 22cae78d17..ec7ace3a21 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -93,6 +93,11 @@ public class MeasurementEditingContext {
 	}
 
 	void setSnapToRoadAppMode(ApplicationMode snapToRoadAppMode) {
+		if (this.snapToRoadAppMode != null
+				&& !this.snapToRoadAppMode.getStringKey().equals(snapToRoadAppMode.getStringKey())) {
+			snappedToRoadPoints.clear();
+			updateCacheForSnapIfNeeded(true);
+		}
 		this.snapToRoadAppMode = snapToRoadAppMode;
 	}