diff --git a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
index df23f4f710..28be86089f 100644
--- a/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
+++ b/OsmAnd/src/net/osmand/plus/server/endpoints/TileEndpoint.java
@@ -8,6 +8,7 @@ import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.resources.AsyncLoadingThread;
 import net.osmand.plus.server.OsmAndHttpServer;
+import net.osmand.util.MapUtils;
 import org.apache.commons.logging.Log;
 
 import java.io.ByteArrayInputStream;
@@ -20,7 +21,6 @@ public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint {
 	private static final int TIMEOUT = 15000;
 	private static final Log LOG = PlatformUtil.getLog(TileEndpoint.class);
 	@GuardedBy("this")
-	//todo cancel on zoom
 	private static int lastZoom = -999;
 	//TODO restore mapState on Exit
 	private final RotatedTileBox mapTileBoxCopy;
@@ -53,6 +53,11 @@ public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint {
 		int zoom = Integer.parseInt(prms[1]);
 		int x = Integer.parseInt(prms[2]);
 		int y = Integer.parseInt(prms[3]);
+		synchronized (this){
+			if (zoom > lastZoom+1 || zoom < lastZoom-1){
+				lastZoom = zoom;
+			}
+		}
 		MetaTileFileSystemCache.MetaTileCache res = cache.get(zoom, x, y);
 		if (res == null) {
 			res = requestMetatile(x, y, zoom);
@@ -82,6 +87,9 @@ public class TileEndpoint implements OsmAndHttpServer.ApiEndpoint {
 		if (cacheTile != null) {
 			return cacheTile;
 		}
+		if (zoom != lastZoom){
+			return null;
+		}
 		MetaTileFileSystemCache.MetaTileCache res = cache.createMetaTile(zoom, x, y);
 		mapActivity.getMapView().setCurrentViewport(res.bbox);
 		int timeout = 0;