diff --git a/data/src/main/kotlin/com/alfresco/content/data/OfflineRepository.kt b/data/src/main/kotlin/com/alfresco/content/data/OfflineRepository.kt
index ebecf4c33..6f615a471 100644
--- a/data/src/main/kotlin/com/alfresco/content/data/OfflineRepository.kt
+++ b/data/src/main/kotlin/com/alfresco/content/data/OfflineRepository.kt
@@ -116,7 +116,8 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
         box.query()
             .apply {
                 contains(Entry_.name, name, StringOrder.CASE_INSENSITIVE)
-                equal(Entry_.isOffline, true)
+                notEqual(Entry_.offlineStatus, OfflineStatus.UNDEFINED.value(), StringOrder.CASE_SENSITIVE)
+                equal(Entry_.isUpload, false)
             }.order(Entry_.name).build().find()
 
     internal fun fetchTopLevelOfflineEntries() =