2 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
index e460d27cd8..eda0ba6759 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -194,7 +194,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
         val currentState = daemon.getState()
 
         synchronized(this) {
-            if (state === initialState) {
+            if (state === initialState && currentState != null) {
                 state = currentState
             }
         }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 2ba0ba42cb..b144b7753f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -74,7 +74,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         return getSettings(daemonInterfaceAddress)
     }
 
-    fun getState(): TunnelState {
+    fun getState(): TunnelState? {
         return getState(daemonInterfaceAddress)
     }
 
@@ -147,7 +147,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
     private external fun getCurrentVersion(daemonInterfaceAddress: Long): String
     private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList?
     private external fun getSettings(daemonInterfaceAddress: Long): Settings
-    private external fun getState(daemonInterfaceAddress: Long): TunnelState
+    private external fun getState(daemonInterfaceAddress: Long): TunnelState?
     private external fun getVersionInfo(daemonInterfaceAddress: Long): AppVersionInfo?
     private external fun getWireguardKey(daemonInterfaceAddress: Long): PublicKey?
     private external fun reconnect(daemonInterfaceAddress: Long)