diff --git a/src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java b/src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
index ba7da8a90..20d9c485e 100644
--- a/src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
+++ b/src/org/thoughtcrime/securesms/geolocation/DcLocationManager.java
@@ -65,7 +65,9 @@ public class DcLocationManager implements Observer {
         if (serviceBinder == null) {
             return;
         }
+        context.unbindService(serviceConnection);
         serviceBinder.stop();
+        serviceBinder = null;
     }
 
     public void stopSharingLocation(int chatId) {