diff --git a/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt b/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt
index 95a7dcff3..22f4f5100 100644
--- a/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt
+++ b/app/src/main/java/com/aurora/store/view/custom/layouts/button/UpdateButton.kt
@@ -25,7 +25,6 @@ import android.util.AttributeSet
 import android.widget.RelativeLayout
 import com.aurora.extensions.accentColor
 import com.aurora.extensions.darkenColor
-import com.aurora.extensions.getString
 import com.aurora.extensions.lightenColor
 import com.aurora.extensions.runOnUiThread
 import com.aurora.store.R
@@ -66,16 +65,6 @@ class UpdateButton : RelativeLayout {
         binding.btnNegative.setTextColor(textColor)
     }
 
-    fun setText(text: String) {
-        binding.viewFlipper.displayedChild = 0
-        binding.btnPositive.text = text
-    }
-
-    fun setText(text: Int) {
-        binding.viewFlipper.displayedChild = 0
-        binding.btnPositive.text = getString(text)
-    }
-
     fun updateState(downloadStatus: DownloadStatus) {
         val displayChild = when (downloadStatus) {
             DownloadStatus.QUEUED -> 1
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
index cb66206b9..71d008743 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
@@ -37,7 +37,6 @@ import com.airbnb.epoxy.ModelView
 import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.extensions.invisible
 import com.aurora.extensions.px
-import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.data.model.DownloadStatus
 import com.aurora.store.data.room.download.Download
@@ -143,9 +142,16 @@ class AppUpdateView @JvmOverloads constructor(
 
     @OnViewRecycled
     fun clear() {
-        binding.headerIndicator.removeCallbacks { }
-        binding.progressDownload.invisible()
         iconDrawable = null
+
+        binding.apply {
+            headerIndicator.removeCallbacks {}
+            progressDownload.invisible()
+            btnAction.apply {
+                removeCallbacks { }
+                updateState(DownloadStatus.UNAVAILABLE)
+            }
+        }
     }
 
     private fun animateImageView(scaleFactor: Float = 1f) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
index 1d9343598..3462ec9b4 100644
--- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
@@ -51,7 +51,6 @@ import kotlinx.coroutines.launch
 class UpdatesFragment : BaseFragment<FragmentUpdatesBinding>() {
 
     private lateinit var permissionProvider: PermissionProvider
-    private lateinit var update: Update
 
     private val viewModel: UpdatesViewModel by viewModels()
 
@@ -194,7 +193,6 @@ class UpdatesFragment : BaseFragment<FragmentUpdatesBinding>() {
     }
 
     private fun updateSingle(update: Update, updateAll: Boolean = false) {
-        this.update = update
         viewModel.updateAllEnqueued = updateAll
 
         if (PathUtil.needsStorageManagerPerm(update.fileList)) {