diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cda..7158618 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/domain/src/main/java/com/rxweather/domain/usercase/PrepareCase.java b/domain/src/main/java/com/rxweather/domain/usercase/PrepareCase.java
index 21ff5e6..197c9a0 100644
--- a/domain/src/main/java/com/rxweather/domain/usercase/PrepareCase.java
+++ b/domain/src/main/java/com/rxweather/domain/usercase/PrepareCase.java
@@ -76,6 +76,8 @@ public void onLocationChanged(final Location location) {
               subscriber.onNext(location);
               subscriber.onCompleted();
             }
+            locationManager.removeUpdates(this);
+            handlerThread.getLooper().quit();
           }
         };