diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
index 97b9650d4f6b..0dc4d2f3fcf9 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
@@ -57,9 +57,6 @@ import org.wordpress.android.viewmodel.uistate.ProgressBarUiState
 import javax.inject.Inject
 import javax.inject.Named
 
-private const val MAX_TOPOLOGICAL_PAGE_COUNT = 100
-private const val DEFAULT_INDENT = 0
-
 class PageListViewModel @Inject constructor(
     private val createPageListItemLabelsUseCase: CreatePageListItemLabelsUseCase,
     private val postModelUploadUiStateUseCase: PostModelUploadUiStateUseCase,
@@ -317,23 +314,16 @@ class PageListViewModel @Inject constructor(
     }
 
     private fun preparePublishedPages(pages: List<PageModel>, actionsEnabled: Boolean): List<PageItem> {
-        val shouldSortTopologically = pages.size < MAX_TOPOLOGICAL_PAGE_COUNT
-        val sortedPages = (if (shouldSortTopologically) {
-            topologicalSort(pages.sortedBy { !(it.isHomepage && it.parent == null) }, listType = PUBLISHED)
-        } else {
-            pages.sortedByDescending { it.date }.sortedBy { !it.isHomepage }
-        })
+        val sortedPages = topologicalSort(
+            pages.sortedBy { !(it.isHomepage && it.parent == null) },
+            listType = PUBLISHED
+        )
 
         val showVirtualHomepage = siteEditorMVPFeatureConfig.isEnabled() && isBlockBasedTheme.value
 
         return sortedPages
             .let { if (showVirtualHomepage) it.filterNot { page -> page.isHomepage } else it }
             .map {
-                val pageItemIndent = if (shouldSortTopologically) {
-                    getPageItemIndent(it)
-                } else {
-                    DEFAULT_INDENT
-                }
                 val itemUiStateData = createItemUiStateData(it)
                 val author = getAuthorName(it.post)
                 PublishedPage(
@@ -345,7 +335,7 @@ class PageListViewModel @Inject constructor(
                     date = it.date,
                     labels = itemUiStateData.labels,
                     labelsColor = itemUiStateData.labelsColor,
-                    indent = pageItemIndent,
+                    indent = getPageItemIndent(it),
                     imageUrl = getFeaturedImageUrl(it.featuredImageId),
                     actions = itemUiStateData.actions,
                     actionsEnabled = actionsEnabled,
@@ -458,18 +448,25 @@ class PageListViewModel @Inject constructor(
 
     private fun topologicalSort(
         pages: List<PageModel>,
-        listType: PageListType,
-        parent: PageModel? = null
+        listType: PageListType
     ): List<PageModel> {
-        val sortedList = mutableListOf<PageModel>()
-        pages.filter {
-            it.parent?.remoteId == parent?.remoteId ||
-                    (parent == null && !listType.pageStatuses.contains(it.parent?.status))
-        }.forEach {
-            sortedList += it
-            sortedList += topologicalSort(pages, listType, it)
+        val isRoot = { page: PageModel ->
+            page.parent?.remoteId == null ||
+                !listType.pageStatuses.contains(page.parent?.status)
+        }
+        val childrenByParentId = pages
+            .filterNot { isRoot(it) }
+            .groupBy { it.parent?.remoteId }
+        val roots = pages.filter { isRoot(it) }
+
+        fun collect(page: PageModel, result: MutableList<PageModel>) {
+            result += page
+            childrenByParentId[page.remoteId]?.forEach {
+                collect(it, result)
+            }
         }
-        return sortedList
+
+        return buildList { roots.forEach { collect(it, this) } }
     }
 
     private fun getPageItemIndent(page: PageModel?): Int {
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
index 13d3fa2d60e6..2e4547fd44dd 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
@@ -238,52 +238,7 @@ class PageListViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `sorts 100 or more pages by date DESC`() {
-        val pages = MutableLiveData<List<PageModel>>()
-        whenever(pagesViewModel.pages).thenReturn(pages)
-
-        viewModel.start(PUBLISHED, pagesViewModel)
-
-        val result = mutableListOf<Triple<List<PageItem>, Boolean, Boolean>>()
-
-        viewModel.pages.observeForever { result.add(it) }
-
-        val earlyPages = (0..30).map { buildPageModel(it, Date(HOUR_IN_MILLISECONDS * it)) }
-        val latePages = (31..60).map { buildPageModel(it, Date(100 * HOUR_IN_MILLISECONDS * it)) }
-        val middlePages = (61..96).map { buildPageModel(it, Date(10 * HOUR_IN_MILLISECONDS * it)) }
-        val earlyChild = buildPageModel(97, Date(40 * HOUR_IN_MILLISECONDS), earlyPages[0])
-        val middleChild = buildPageModel(98, Date(1000 * HOUR_IN_MILLISECONDS), middlePages[0])
-        val lateChild = buildPageModel(99, Date(7000 * HOUR_IN_MILLISECONDS), latePages[0])
-        val children = listOf(middleChild, earlyChild, lateChild)
-
-        val pageModels = mutableListOf<PageModel>()
-        pageModels.addAll(middlePages)
-        pageModels.addAll(latePages)
-        pageModels.addAll(children)
-        pageModels.addAll(earlyPages)
-        pages.value = pageModels
-
-        assertThat(result).hasSize(1)
-        val pageItems = result[0].first
-        assertThat(pageItems).hasSize(102)
-        assertPublishedPage(pageItems[0], lateChild)
-        for (index in 1..latePages.size) {
-            assertPublishedPage(pageItems[index], latePages[latePages.size - index])
-        }
-        assertPublishedPage(pageItems[31], middleChild)
-        for (index in 1..middlePages.size) {
-            assertPublishedPage(pageItems[31 + index], middlePages[middlePages.size - index])
-        }
-        assertPublishedPage(pageItems[68], earlyChild)
-        for (index in 1..earlyPages.size) {
-            assertPublishedPage(pageItems[68 + index], earlyPages[earlyPages.size - index])
-        }
-        assertDivider(pageItems[100])
-        assertDivider(pageItems[101])
-    }
-
-    @Test
-    fun `sorts up to 99 pages topologically`() {
+    fun `sorts pages topologically`() {
         val pages = MutableLiveData<List<PageModel>>()
         whenever(pagesViewModel.pages).thenReturn(pages)