diff --git a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
index 1ad889c0..413de26d 100644
--- a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java
@@ -43,7 +43,6 @@ public class LocationActivity extends SimpleMapActivity implements LocationListe
         super.onResume();
 
         enableAvailableProviders();
-        locationLayer.setEnabled(true);
     }
 
     @Override
@@ -56,6 +55,7 @@ public class LocationActivity extends SimpleMapActivity implements LocationListe
 
     @Override
     public void onLocationChanged(Location location) {
+        locationLayer.setEnabled(true);
         locationLayer.setPosition(location.getLatitude(), location.getLongitude(), location.getAccuracy());
 
         // Follow location
diff --git a/vtm/src/org/oscim/layers/LocationLayer.java b/vtm/src/org/oscim/layers/LocationLayer.java
index 73d2185c..fc45085a 100644
--- a/vtm/src/org/oscim/layers/LocationLayer.java
+++ b/vtm/src/org/oscim/layers/LocationLayer.java
@@ -27,6 +27,7 @@ public class LocationLayer extends Layer {
         super(map);
 
         mRenderer = locationRenderer = new LocationRenderer(mMap, this);
+        setEnabled(false);
     }
 
     @Override