diff --git a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
index <HASH>..<HASH> 100644
--- a/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
+++ b/lib/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java
@@ -445,6 +445,9 @@ public class AirMapMarker extends AirMapFeature {
 
   @Override
   public void removeFromMap(GoogleMap map) {
+    if (marker == null) {
+      return;
+    }
     marker.remove();
     marker = null;
     updateTracksViewChanges();
Fixes NPE while removing already removed marker. (#<I>)