1 files changed, 10 insertions, 7 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 00a486b065..be49d3723c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -174,6 +174,7 @@ class MullvadVpnService : TalpidVpnService() {
         state = State.Stopped
         notificationManager.onDestroy()
         daemonInstance.onDestroy()
+        instance = null
         super.onDestroy()
     }
 
@@ -235,13 +236,15 @@ class MullvadVpnService : TalpidVpnService() {
 
         handlePendingAction(connectionProxy, settings)
 
-        instance = ServiceInstance(
-            daemon,
-            connectionProxy,
-            connectivityListener,
-            settingsListener,
-            splitTunneling
-        )
+        if (state == State.Running) {
+            instance = ServiceInstance(
+                daemon,
+                connectionProxy,
+                connectivityListener,
+                settingsListener,
+                splitTunneling
+            )
+        }
     }
 
     private fun stop() {