1 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
index fa55dbd0cf..638a30d333 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
@@ -12,16 +12,16 @@ class TunnelStateUpdater(context: Context, serviceNotifier: EventNotifier<Servic
     private var stateSubscriptionId: Int? = null
 
     init {
-        serviceNotifier.subscribe { serviceInstance ->
+        serviceNotifier.subscribe(this) { serviceInstance ->
             onNewServiceInstance(serviceInstance)
         }
     }
 
     private fun onNewServiceInstance(serviceInstance: ServiceInstance?) {
-        stateSubscriptionId?.let { id -> connectionProxy?.onStateChange?.unsubscribe(id) }
+        connectionProxy?.onStateChange?.unsubscribe(this)
 
         connectionProxy = serviceInstance?.connectionProxy?.apply {
-            stateSubscriptionId = onStateChange.subscribe { newState ->
+            onStateChange.subscribe(this@TunnelStateUpdater) { newState ->
                 persistence.state = newState
             }
         }