diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
index 96269cb..d4fc47c 100644
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -64,7 +64,11 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
             )
         } else {
             if (itemsCaching) {
-                fetchedItems = getDBItems().map { it.toView() }
+                fetchedItems = getDBItems().filter {
+                    displayedItems == ItemType.ALL ||
+                            (it.unread && displayedItems == ItemType.UNREAD) ||
+                            (it.starred && displayedItems == ItemType.STARRED)
+                }.map { it.toView() }
             }
         }