diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 2c260e6515..b973536f19 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -198,9 +198,7 @@ public class MapActivity extends AccessibleActivity {
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
 		mapView.refreshMap(true);
-		if(dashboardOnMap != null) {
-			dashboardOnMap.updateLocation(true, true, false);
-		}
+		dashboardOnMap.updateLocation(true, true, false);
 	}
 
 	private void checkAppInitialization() {
diff --git a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
index 8b79cc5181..9258109555 100644
--- a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
+++ b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
@@ -174,6 +174,9 @@ public class FailSafeFuntions {
 		routingHelper.setFollowingMode(true);
 		app.getTargetPointsHelper().updateRouteAndReferesh(true);
 		app.initVoiceCommandPlayer(ma);
+		if(ma.getDashboard().isVisible()) {
+			ma.getDashboard().hideDashboard();
+		}
 	}
 	
 	private static void notRestoreRoutingMode(MapActivity ma, OsmandApplication app){