1 files changed, 6 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 2d8645b6be..c59f1b192d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -24,6 +24,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     private lateinit var locationInfo: LocationInfo
 
     private lateinit var updateKeyStatusJob: Job
+    private var updateLocationInfoJob: Job? = null
     private var updateTunnelStateJob: Job? = null
 
     private var isTunnelInfoExpanded = false
@@ -82,7 +83,10 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         }
 
         locationInfoCache.onNewLocation = { location ->
-            locationInfo.location = location
+            updateLocationInfoJob?.cancel()
+            updateLocationInfoJob = GlobalScope.launch(Dispatchers.Main) {
+                locationInfo.location = location
+            }
         }
 
         relayListListener.onRelayListChange = { _, selectedRelayItem ->
@@ -105,6 +109,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             connectionProxy.onUiStateChange.unsubscribe(listener)
         }
 
+        updateLocationInfoJob?.cancel()
         updateTunnelStateJob?.cancel()
         notificationBanner.onPause()