diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 601fb62909..542d125afe 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -232,7 +232,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 				switchToRoutePlanningMode();
 			}
 			// When location is changed we need to refresh map in order to show movement!
-			mapView.refreshMap();
+			if (!mapView.isServerRendering()){
+				mapView.refreshMap();
+			}
 		}
 
 		if (dashboard != null) {
diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
index de41803cef..467903bf9d 100644
--- a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
+++ b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
@@ -62,7 +62,7 @@ public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint {
 	}
 
 	@Override
-	public synchronized NanoHTTPD.Response process(NanoHTTPD.IHTTPSession session, String url) {
+	public NanoHTTPD.Response process(NanoHTTPD.IHTTPSession session, String url) {
 		// https://tile.osmand.net/hd/6/55/25.png
 		int extInd = url.indexOf('.');
 		if (extInd >= 0) {