diff --git a/android-reactive-location/src/main/java/pl/charmas/android/reactivelocation2/observables/location/LocationUpdatesObservableOnSubscribe.java b/android-reactive-location/src/main/java/pl/charmas/android/reactivelocation2/observables/location/LocationUpdatesObservableOnSubscribe.java
index 5b0c0254..715cf5ca 100644
--- a/android-reactive-location/src/main/java/pl/charmas/android/reactivelocation2/observables/location/LocationUpdatesObservableOnSubscribe.java
+++ b/android-reactive-location/src/main/java/pl/charmas/android/reactivelocation2/observables/location/LocationUpdatesObservableOnSubscribe.java
@@ -43,7 +43,7 @@ protected void onGoogleApiClientReady(GoogleApiClient apiClient, final Observabl
 
     @Override
     protected void onDisposed(GoogleApiClient locationClient) {
-        if (locationClient.isConnected()) {
+        if (locationClient.isConnected() && listener != null) {
             LocationServices.FusedLocationApi.removeLocationUpdates(locationClient, listener);
         }
     }