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 22b309f5..580c815a 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
@@ -38,6 +38,10 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
         }
 
         override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
+            if (currentNetwork == null) {
+                onAvailable(network)
+                return
+            }
             if (currentNetwork != network) return
             val oldProperties = currentLinkProperties!!
             currentLinkProperties = properties
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 7686d44b..8dad7450 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
@@ -43,6 +43,10 @@ object VpnMonitor : UpstreamMonitor() {
 
         override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
             synchronized(this@VpnMonitor) {
+                if (currentNetwork == null) {
+                    onAvailable(network)
+                    return
+                }
                 if (currentNetwork != network) return
                 val oldProperties = available.put(network, properties)!!
                 val ifname = properties.interfaceName