diff --git a/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java b/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
index 7ae9c3ee8..0364909a5 100644
--- a/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
+++ b/android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
@@ -318,7 +318,9 @@ public void onStyleLoaded(@NonNull Style style) {
       }
       
       if (myLocationEnabled) {
-        enableLocationComponent(style);
+        if (hasLocationPermission()) {
+          updateMyLocationEnabled();
+        }
       }
       // needs to be placed after SymbolManager#addClickListener,
       // is fixed with 0.6.0 of annotations plugin