1 files changed, 18 insertions, 15 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 3fe98efa34..894cbbf27b 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -1391,27 +1391,30 @@ final class NativeMapView implements NativeMap {
   }
 
   @Override
-  public void setOnFpsChangedListener(@NonNull final MapboxMap.OnFpsChangedListener listener) {
+  public void setOnFpsChangedListener(@Nullable final MapboxMap.OnFpsChangedListener listener) {
     final Handler handler = new Handler();
     mapRenderer.queueEvent(new Runnable() {
 
       @Override
       public void run() {
-        mapRenderer.setOnFpsChangedListener(new MapboxMap.OnFpsChangedListener() {
-          @Override
-          public void onFpsChanged(final double fps) {
-            handler.post(new Runnable() {
-
-              @Override
-              public void run() {
-                listener.onFpsChanged(fps);
-              }
-
-            });
-          }
-        });
+        if (listener != null) {
+          mapRenderer.setOnFpsChangedListener(new MapboxMap.OnFpsChangedListener() {
+            @Override
+            public void onFpsChanged(final double fps) {
+              handler.post(new Runnable() {
+
+                @Override
+                public void run() {
+                  listener.onFpsChanged(fps);
+                }
+
+              });
+            }
+          });
+        } else {
+          mapRenderer.setOnFpsChangedListener(null);
+        }
       }
-
     });
   }