1 files changed, 5 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index f0155bda58..95d5c29b61 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -128,7 +128,6 @@ public final class MapboxMap {
    * Called when the hosting Activity/Fragment onStart() method is called.
    */
   void onStart() {
-    nativeMapView.update();
     locationComponent.onStart();
   }
 
@@ -174,6 +173,10 @@ public final class MapboxMap {
    */
   void onDestroy() {
     locationComponent.onDestroy();
+    if (style != null) {
+      style.clear();
+    }
+    cameraChangeDispatcher.onDestroy();
   }
 
   /**
@@ -813,7 +816,7 @@ public final class MapboxMap {
   public void setStyle(Style.Builder builder, final Style.OnStyleLoaded callback) {
     locationComponent.onStartLoadingMap();
     if (style != null) {
-      style.onWillStartLoadingMap();
+      style.clear();
     }
 
     if (callback != null) {