diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
index 90cbe2d5..265e940f 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
@@ -39,6 +39,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
         // handle complicated default value and possible system upgrades
         WifiDoubleLock.mode = WifiDoubleLock.mode
         RoutingManager.masqueradeMode = RoutingManager.masqueradeMode
+        IpMonitor.currentMode = IpMonitor.currentMode
         preferenceManager.preferenceDataStore = SharedPreferenceDataStore(app.pref)
         addPreferencesFromResource(R.xml.pref_settings)
         SummaryFallbackProvider(findPreference(UpstreamMonitor.KEY)!!)
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
index eae976d7..38f9fac6 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
@@ -3,6 +3,7 @@ package be.mygod.vpnhotspot.net.monitor
 import android.os.Build
 import android.system.ErrnoException
 import android.system.OsConstants
+import androidx.core.content.edit
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.R
 import be.mygod.vpnhotspot.util.RootSession
@@ -21,12 +22,14 @@ abstract class IpMonitor : Runnable {
         // https://android.googlesource.com/platform/external/iproute2/+/7f7a711/lib/libnetlink.c#493
         private val errorMatcher = ("(^Cannot bind netlink socket: |" +
                 "Dump (was interrupted and may be inconsistent.|terminated)$)").toRegex()
-        private val currentMode: Mode get() {
-            val defaultMode = if (Build.VERSION.SDK_INT < 30) @Suppress("DEPRECATION") {
-                Mode.Poll
-            } else Mode.MonitorRoot
-            return Mode.valueOf(app.pref.getString(KEY, defaultMode.toString()) ?: "")
-        }
+        var currentMode: Mode
+            get() {
+                val defaultMode = if (Build.VERSION.SDK_INT < 30) @Suppress("DEPRECATION") {
+                    Mode.Poll
+                } else Mode.MonitorRoot
+                return Mode.valueOf(app.pref.getString(KEY, defaultMode.toString()) ?: "")
+            }
+            set(value) = app.pref.edit { putString(KEY, value.toString()) }
     }
 
     enum class Mode(val isMonitor: Boolean = false) {
diff --git a/mobile/src/main/res/xml/pref_settings.xml b/mobile/src/main/res/xml/pref_settings.xml
index 854e0e45..2f047ab9 100644
--- a/mobile/src/main/res/xml/pref_settings.xml
+++ b/mobile/src/main/res/xml/pref_settings.xml
@@ -73,7 +73,6 @@
             app:icon="@drawable/ic_hardware_device_hub"
             app:entries="@array/settings_service_ip_monitor"
             app:entryValues="@array/settings_service_ip_monitor_values"
-            app:defaultValue="Poll"
             app:title="@string/settings_service_ip_monitor"
             app:useSimpleSummaryProvider="true"/>
     </PreferenceCategory>