diff --git a/docs/Changelog.md b/docs/Changelog.md
index 043be9f1..fb9baf0b 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -6,7 +6,7 @@
 - Marker clustering [#312](https://github.com/mapsforge/vtm/issues/312)
 - Osmagray theme [#300](https://github.com/mapsforge/vtm/issues/300)
 - Symbol rotation [#294](https://github.com/mapsforge/vtm/issues/294)
-- Location renderer improvements [#317](https://github.com/mapsforge/vtm/issues/317) [#321](https://github.com/mapsforge/vtm/issues/321) [#361](https://github.com/mapsforge/vtm/issues/361)
+- Location renderer improvements [#317](https://github.com/mapsforge/vtm/issues/317)
 - POT textures [#334](https://github.com/mapsforge/vtm/issues/334)
 - OkHttp external cache [#135](https://github.com/mapsforge/vtm/issues/135)
 - Texture atlas improvements [#301](https://github.com/mapsforge/vtm/pull/301) [#304](https://github.com/mapsforge/vtm/pull/304)
diff --git a/vtm/src/org/oscim/renderer/LocationRenderer.java b/vtm/src/org/oscim/renderer/LocationRenderer.java
index d3e8f4ca..ae21f844 100644
--- a/vtm/src/org/oscim/renderer/LocationRenderer.java
+++ b/vtm/src/org/oscim/renderer/LocationRenderer.java
@@ -125,7 +125,8 @@ public class LocationRenderer extends LayerRenderer {
 
                 long diff = System.currentTimeMillis() - lastRun;
                 mMap.postDelayed(this, Math.min(ANIM_RATE, diff));
-                mMap.render();
+                if (!mLocationIsVisible)
+                    mMap.render();
                 lastRun = System.currentTimeMillis();
             }
         };