diff --git a/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt
index 8cf7aba45..a3a154c28 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt
@@ -107,7 +107,7 @@ class AppDetailsViewModel @Inject constructor(
 
     private val download = combine(app, downloadHelper.downloadsList) { a, list ->
         if (a?.packageName.isNullOrBlank()) return@combine null
-        list.find { d -> d.packageName == a?.packageName }
+        list.find { d -> d.packageName == a.packageName }
     }.stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     private val isInstalled: Boolean
@@ -155,7 +155,7 @@ class AppDetailsViewModel @Inject constructor(
             }
         }.invokeOnCompletion { throwable ->
             // Only proceed if there was no error while fetching the app details
-            if (throwable != null) return@invokeOnCompletion
+            if (throwable != null || app.value == null) return@invokeOnCompletion
 
             fetchFavourite(packageName)
             fetchFeaturedReviews(packageName)