diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
index b2f85940e..b43f900e8 100644
--- a/app/src/full/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
+++ b/app/src/full/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
@@ -14,7 +14,7 @@ class GeocodeSensorManager : SensorManager {
 
     companion object {
         private const val TAG = "GeocodeSM"
-        private val geocodedLocation = SensorManager.BasicSensor(
+        val geocodedLocation = SensorManager.BasicSensor(
             "geocoded_location",
             "sensor",
             "Geocoded Location",
diff --git a/app/src/main/java/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt b/app/src/main/java/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt
index c696273b3..445c810c7 100644
--- a/app/src/main/java/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt
@@ -24,7 +24,9 @@ import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.database.AppDatabase
 import io.homeassistant.companion.android.database.sensor.Sensor
+import io.homeassistant.companion.android.sensors.GeocodeSensorManager
 import io.homeassistant.companion.android.sensors.LocationSensorManager
+import io.homeassistant.companion.android.sensors.NetworkSensorManager
 import io.homeassistant.companion.android.sensors.PhoneStateSensorManager
 import io.homeassistant.companion.android.sensors.SensorWorker
 import javax.inject.Inject
@@ -187,6 +189,8 @@ class MobileAppIntegrationFragment : Fragment(), MobileAppIntegrationView {
                 zoneTrackingSummary.isEnabled = true
                 zoneTracking.isChecked = true
                 updateSensorDao(LocationSensorManager.zoneLocation.id, true)
+                updateSensorDao(NetworkSensorManager.wifiConnection.id, true)
+                updateSensorDao(GeocodeSensorManager.geocodedLocation.id, true)
 
                 backgroundTracking.isEnabled = true
                 backgroundTrackingSummary.isEnabled = true
diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt
index c77f9304e..134fa5b4a 100644
--- a/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt
@@ -10,7 +10,7 @@ import io.homeassistant.companion.android.R
 class NetworkSensorManager : SensorManager {
     companion object {
         private const val TAG = "NetworkSM"
-        private val wifiConnection = SensorManager.BasicSensor(
+        val wifiConnection = SensorManager.BasicSensor(
             "wifi_connection",
             "sensor",
             "Wifi Connection",
diff --git a/app/src/minimal/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt b/app/src/minimal/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
index 43355667a..271037079 100644
--- a/app/src/minimal/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
+++ b/app/src/minimal/java/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt
@@ -1,8 +1,20 @@
 package io.homeassistant.companion.android.sensors
 
 import android.content.Context
+import io.homeassistant.companion.android.R
 
 class GeocodeSensorManager : SensorManager {
+
+    companion object {
+        private const val TAG = "GeocodeSM"
+        val geocodedLocation = SensorManager.BasicSensor(
+            "geocoded_location",
+            "sensor",
+            "Geocoded Location",
+            R.string.sensor_description_geocoded_location
+        )
+    }
+
     override val name: String
         get() = "Geocode Sensors"
     override val availableSensors: List<SensorManager.BasicSensor>