diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
index a6e1e63c32..0eff5b0ac6 100644
--- a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
+++ b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
@@ -17,8 +17,8 @@ import static fi.iki.elonen.NanoHTTPD.newFixedLengthResponse;
 
 public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint {
 
-	private static final int TIMEOUT_STEP = 500;
-	private static final int TIMEOUT = 10000;
+	private static final int TIMEOUT_STEP = 150;
+	private static final int TIMEOUT = 15000;
 
 
 	private static final Log LOG = PlatformUtil.getLog(TileEndpoint.class);
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index f3d6660e6b..a3d06de9d7 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -880,7 +880,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 
 	public void setCurrentViewport(RotatedTileBox viewport) {
 		currentViewport = viewport;
-		refreshMap();
+		refreshMap(true);
 	}
 
 	public Bitmap getBufferBitmap() {