1 files changed, 10 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
index 347cffdb46..73195df86f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
@@ -20,11 +20,19 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
             synchronized(this) {
                 upgradeVersion = if (isStable) value?.latestStable else value?.latest
 
-                if (upgradeVersion == version) {
+                if (value != null && upgradeVersion == version) {
                     upgradeVersion = null
+
+                    field = AppVersionInfo(
+                        value.currentIsSupported,
+                        /* currentIsOutdated = */ false,
+                        value.latestStable,
+                        value.latest
+                    )
+                } else {
+                    field = value
                 }
 
-                field = value
                 onUpdate?.invoke()
             }
         }