diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
index 2b9c99c..dc3d682 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
@@ -51,6 +51,17 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<ReactNativeMap
         return new ReactNativeMapboxGLView(context, this);
     }
 
+    @Override
+    protected void onAfterUpdateTransaction(ReactNativeMapboxGLView view) {
+        super.onAfterUpdateTransaction(view);
+        view.onAfterUpdateTransaction();
+    }
+
+    @Override
+    public void onDropViewInstance(ReactNativeMapboxGLView view) {
+        view.onDrop();
+    }
+
     // Props
 
     @ReactProp(name = "initialZoomLevel")
diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
index c74097c..392498a 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLView.java
@@ -73,28 +73,23 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
 
     // Lifecycle methods
 
-    @Override
-    public void onAttachedToWindow () {
-        super.onAttachedToWindow();
-        if (_mapView == null) {
-            setupMapView();
-        }
+    public void onAfterUpdateTransaction() {
+        if (_mapView != null) { return; }
+        setupMapView();
         _paused = false;
         _mapView.onResume();
         _manager.getContext().addLifecycleEventListener(this);
     }
 
-    @Override
-    public void onDetachedFromWindow () {
-        if (_mapView != null) {
-            if (!_paused) {
-                _paused = true;
-                _mapView.onPause();
-            }
-            _mapView.onDestroy();
-        }
+    public void onDrop() {
+        if (_mapView == null) { return; }
         _manager.getContext().removeLifecycleEventListener(this);
-        super.onDetachedFromWindow();
+        if (!_paused) {
+            _paused = true;
+            _mapView.onPause();
+        }
+        destroyMapView();
+        _mapView = null;
     }
 
     @Override
@@ -111,17 +106,7 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
 
     @Override
     public void onHostDestroy() {
-        _mapView.removeOnMapChangedListener(this);
-        if (_map != null) {
-            _map.setOnMapClickListener(null);
-            _map.setOnMapLongClickListener(null);
-            _map.setOnMyLocationTrackingModeChangeListener(null);
-            _map.setOnMyBearingTrackingModeChangeListener(null);
-            _map.setOnMyLocationChangeListener(null);
-            _map = null;
-        }
-        _mapView.onDestroy();
-        _mapView = null;
+        onDrop();
     }
 
     // Initialization
@@ -137,6 +122,7 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
 
     @Override
     public void onMapReady(MapboxMap mapboxMap) {
+        if (_mapView == null) { return; }
         _map = mapboxMap;
 
         // Configure map
@@ -175,6 +161,19 @@ public class ReactNativeMapboxGLView extends RelativeLayout implements
         _map.setOnMyLocationChangeListener(this);
     }
 
+    private void destroyMapView() {
+        _mapView.removeOnMapChangedListener(this);
+        if (_map != null) {
+            _map.setOnMapClickListener(null);
+            _map.setOnMapLongClickListener(null);
+            _map.setOnMyLocationTrackingModeChangeListener(null);
+            _map.setOnMyBearingTrackingModeChangeListener(null);
+            _map.setOnMyLocationChangeListener(null);
+            _map = null;
+        }
+        _mapView.onDestroy();
+    }
+
     // Props
 
     public void setInitialZoomLevel(double value) {