diff --git a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt b/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
index 1269b8def4c..046f26bc48d 100644
--- a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
+++ b/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
@@ -21,8 +21,8 @@ import java.util.concurrent.Executors
 class MainActivity : AppCompatActivity() {
     var firebaseAppDistribution = Firebase.appDistribution
     var updateTask: Task<Void>? = null
-    var release: AppDistributionRelease? = null
     val executorService: ExecutorService = Executors.newFixedThreadPool(1)
+
     lateinit var signInButton: AppCompatButton
     lateinit var signOutButton: AppCompatButton
     lateinit var checkForUpdateButton: AppCompatButton
@@ -111,10 +111,11 @@ class MainActivity : AppCompatActivity() {
             firebaseAppDistribution
                 .checkForNewRelease()
                 .addOnSuccessListener {
-                    setupUI(
-                        isSignedIn = firebaseAppDistribution.isTesterSignedIn,
-                        isUpdateAvailable = it != null,
-                        release = it)
+                        release ->
+                            setupUI(
+                                isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+                                isUpdateAvailable = release != null,
+                                release = release)
                 }
                 .addOnFailureListener { failureListener(it) }
         }
@@ -124,11 +125,11 @@ class MainActivity : AppCompatActivity() {
                 firebaseAppDistribution
                     .checkForNewRelease()
                     .addOnSuccessListener {
-                        release = it
-                        setupUI(
-                            isSignedIn = firebaseAppDistribution.isTesterSignedIn,
-                            isUpdateAvailable = release != null,
-                            release = release)
+                            release ->
+                                setupUI(
+                                    isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+                                    isUpdateAvailable = release != null,
+                                    release = release)
                     }
                     .addOnFailureListener { failureListener(it) }
             }