diff --git a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
index c7beb6767c..551e9d8a12 100644
--- a/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
+++ b/OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java
@@ -93,6 +93,7 @@ public class MapVectorLayer extends BaseMapLayer {
 			if (mapRenderer != null) {
 				// opengl renderer
 				mapRenderer.setTarget(new PointI(tilesRect.getCenter31X(), tilesRect.getCenter31Y()));
+				mapRenderer.setAzimuth(tilesRect.getRotate());
 				mapRenderer.setZoom((float) (tilesRect.getZoom() + tilesRect.getZoomScale() + tilesRect.getZoomAnimation()));
 			} else {
 				if (!view.isZooming()) {
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index c0f457901b..0faf4c2ec8 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -491,7 +491,9 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
 					}
 					// make copy to avoid concurrency 
 					RotatedTileBox viewportToDraw = currentViewport.copy();
-					fillCanvas(canvas, drawSettings);
+					if(mapRenderer != null) {
+						fillCanvas(canvas, drawSettings);
+					}
 					drawOverMap(canvas, viewportToDraw, drawSettings);
 				} finally {
 					holder.unlockCanvasAndPost(canvas);