diff --git a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
index f3643b2617..86dfd6a301 100644
--- a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
+++ b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
@@ -156,7 +156,8 @@ public class MapVectorLayer extends BaseMapLayer {
 			mapRenderer.setVisualZoomShift(zoomMagnifier - 1.0f);
 		} else {
 			if (!view.isZooming()) {
-				if (resourceManager.updateRenderedMapNeeded(tilesRect, drawSettings)) {
+				if (resourceManager.updateRenderedMapNeeded(tilesRect, drawSettings) &&
+						!view.isScreenViewDetached()) {
 					// pixRect.set(-view.getWidth(), -view.getHeight() / 2, 2 * view.getWidth(), 3 *
 					// view.getHeight() / 2);
 					final RotatedTileBox copy = tilesRect.copy();
diff --git a/OsmAnd/src/net/osmand/plus/server/OsmAndHttpServer.java b/OsmAnd/src/net/osmand/plus/server/OsmAndHttpServer.java
index aa67eeeae2..a8524bd840 100644
--- a/OsmAnd/src/net/osmand/plus/server/OsmAndHttpServer.java
+++ b/OsmAnd/src/net/osmand/plus/server/OsmAndHttpServer.java
@@ -108,7 +108,7 @@ public class OsmAndHttpServer extends NanoHTTPD {
 	}
 
 	private void registerEndpoints() {
-		register("/tile", new TileEndpoint(mapActivity));
+		register("/tile", new TileEndpoint(this));
 	}
 
 	private void register(String path, ApiEndpoint endpoint) {