diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
index 63693554ce..5d06ca247c 100644
--- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
@@ -227,7 +227,7 @@ public class TargetPointsHelper {
 	}
 
 	public void updateRouteAndReferesh(boolean updateRoute) {
-		//Issue 2136
+		//Fix for Issue 2136(b-d) (i.e. after Destination has been deleted)
 		if (pointToNavigate == null) {
 			mapActivity.getMapActions().stopNavigationWithoutConfirm();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index a3f8aa5aa3..dbf41eeacd 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -1185,10 +1185,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 					newRouteIsCalculated(false, new ValueHolder<Boolean>());
 					getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true);
 
-					//Issue 2136(b)
-					if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
-						mapActivity.getMapActions().stopNavigationWithoutConfirm();
-					}
+					//Fix for Issue 2136(b), but see more global fix in TargetPointsHelper
+					//if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
+					//	mapActivity.getMapActions().stopNavigationWithoutConfirm();
+					//}
 
 					if (swipeDismissListener != null) {
 						swipeDismissListener.setEnabled(true);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index e185410101..a42e15b70d 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -611,7 +611,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 		if (switched) {
 			mapControlsLayer.switchToRouteFollowingLayout();
 		}
-		//Issue 2136(a)
+		//Fix for Issue 2136(a)
 		if (getTargets().getPointToNavigate() == null) {
 			mapActivity.getMapActions().stopNavigationWithoutConfirm();
 		}