diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
index 4fb808594d8..20f1d8fdf4c 100644
--- a/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
+++ b/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
@@ -771,6 +771,8 @@ class LocationSensorManager : LocationSensorManagerBase() {
 
         if (lastTime != 0L && System.currentTimeMillis() - lastTime < 30000) return
         lastTime = System.currentTimeMillis()
+        canCloseGps = latestContext.getSharedPreferences("config", Context.MODE_PRIVATE)
+            .getInt("canCloseGps", 0)
         checkGps(wifi)
         if (canCloseGps > 5) return
 
@@ -854,6 +856,8 @@ class LocationSensorManager : LocationSensorManagerBase() {
         } else {
             canCloseGps = 0
         }
+        latestContext.getSharedPreferences("config", Context.MODE_PRIVATE).edit()
+            .putInt("canCloseGps", canCloseGps).apply()
     }
 
     private fun isUsingWifi(): Boolean {