diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
index d79571274..5f6361890 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
@@ -275,21 +275,16 @@ open class LatestItem {
         val newestItem = newestItemPerAccount[account.userProfile().pubkeyHex]
 
         // Block list got updated
-        if (newestItem == null || !account.isAcceptable(newestItem)) {
-            newestItemPerAccount =
-                newestItemPerAccount +
-                Pair(
-                    account.userProfile().pubkeyHex,
-                    filterMore(filter.feed(), account).firstOrNull { it.createdAt() != null },
-                )
-        } else {
-            newestItemPerAccount =
-                newestItemPerAccount +
-                Pair(
-                    account.userProfile().pubkeyHex,
-                    filter.sort(filterMore(filter.applyFilter(newNotes), account) + newestItem).first(),
-                )
-        }
+        val newNewest =
+            if (newestItem == null || !account.isAcceptable(newestItem)) {
+                filterMore(filter.feed(), account).firstOrNull { it.createdAt() != null && account.isAcceptable(it) }
+            } else {
+                filter.sort(
+                    filterMore(filter.applyFilter(newNotes), account) + newestItem,
+                ).firstOrNull { it.createdAt() != null && account.isAcceptable(it) }
+            }
+
+        newestItemPerAccount = newestItemPerAccount + Pair(account.userProfile().pubkeyHex, newNewest)
 
         return newestItemPerAccount[account.userProfile().pubkeyHex]
     }