diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
index b2803315..22b309f5 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
@@ -42,13 +42,22 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
             val oldProperties = currentLinkProperties!!
             currentLinkProperties = properties
             val ifname = properties.interfaceName
-            if (ifname == null) {
-                onLost(network)
-                return
+            when {
+                ifname == null -> {
+                    Timber.w(RuntimeException("interfaceName became null: $oldProperties -> $properties"))
+                    onLost(network)
+                }
+                ifname != oldProperties.interfaceName -> {
+                    Timber.w(RuntimeException("interfaceName changed: $oldProperties -> $properties"))
+                    callbacks.forEach {
+                        it.onLost()
+                        it.onAvailable(ifname, properties.dnsServers)
+                    }
+                }
+                properties.dnsServers != oldProperties.dnsServers -> {
+                    callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
+                }
             }
-            check(ifname == oldProperties.interfaceName)
-            if (properties.dnsServers != oldProperties.dnsServers)
-                callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
         }
 
         override fun onLost(network: Network) {
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
index 8f459e45..7686d44b 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
@@ -3,6 +3,7 @@ package be.mygod.vpnhotspot.net.monitor
 import android.net.*
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.debugLog
+import timber.log.Timber
 
 object VpnMonitor : UpstreamMonitor() {
     private const val TAG = "VpnMonitor"
@@ -45,13 +46,22 @@ object VpnMonitor : UpstreamMonitor() {
                 if (currentNetwork != network) return
                 val oldProperties = available.put(network, properties)!!
                 val ifname = properties.interfaceName
-                if (ifname == null) {
-                    onLost(network)
-                    return
+                when {
+                    ifname == null -> {
+                        Timber.w(RuntimeException("interfaceName became null: $oldProperties -> $properties"))
+                        onLost(network)
+                    }
+                    ifname != oldProperties.interfaceName -> {
+                        Timber.w(RuntimeException("interfaceName changed: $oldProperties -> $properties"))
+                        callbacks.forEach {
+                            it.onLost()
+                            it.onAvailable(ifname, properties.dnsServers)
+                        }
+                    }
+                    properties.dnsServers != oldProperties.dnsServers -> {
+                        callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
+                    }
                 }
-                check(ifname == oldProperties.interfaceName)
-                if (properties.dnsServers != oldProperties.dnsServers)
-                    callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
             }
         }