diff --git a/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt
index 0b951a8fe8b3e4e23556aae7a2aed9b12bc5a8c1..2d7651d1d76ae6fd26a14565eab6837d4970dbc7 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt
@@ -138,16 +138,16 @@ class AppListsRepository(
     private var lastFetchApps = 0
     private var refreshAppJob: Job? = null
     private fun refreshAppDescriptions(fetchMissingIcons: Boolean = true, force: Boolean = false): Job? {
-        if (refreshAppJob == null) {
+        if (refreshAppJob == null || refreshAppJob?.isCompleted == true) {
             refreshAppJob = coroutineScope.launch(Dispatchers.IO) {
-                if (force || context.packageManager.getChangedPackages(lastFetchApps) != null) {
+                if (appsByUid.isEmpty() || appsByAPId.isEmpty() ||
+                    force || context.packageManager.getChangedPackages(lastFetchApps) != null
+                ) {
                     fetchAppDescriptions(fetchMissingIcons = fetchMissingIcons)
                     if (fetchMissingIcons) {
                         lastFetchApps = context.packageManager.getChangedPackages(lastFetchApps)
                             ?.sequenceNumber ?: lastFetchApps
                     }
-
-                    refreshAppJob = null
                 }
             }
         }