diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index b472a4dd11..bb8fa623ba 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -516,7 +516,7 @@ class LibraryController(
             (recycler.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition()
         var order = when (val item = adapter.getItem(position)) {
             is LibraryHeaderItem -> item.category.order
-            is LibraryItem -> presenter.categories.find { it.id == item.manga.category }?.order
+            is LibraryItem -> item.header.category.order
             else -> null
         }
         if (order == null) {
@@ -524,7 +524,7 @@ class LibraryController(
                 (recycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
             order = when (val item = adapter.getItem(fPosition)) {
                 is LibraryHeaderItem -> item.category.order
-                is LibraryItem -> presenter.categories.find { it.id == item.manga.category }?.order
+                is LibraryItem -> item.header.category.order
                 else -> null
             }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 858dfe267d..c199fc3c92 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -145,7 +145,7 @@ class LibraryPresenter(
         val showAll = showAllCategories || preferences.hideCategories().getOrDefault() ||
             categories.size == 1
         if (!showAll) {
-            sectionedLibraryItems = items.groupBy { it.manga.category }.toMutableMap()
+            sectionedLibraryItems = items.groupBy { it.header.category.id ?: 0 }.toMutableMap()
             if (currentCategory == -1) currentCategory = categories.find {
                 it.order == preferences.lastUsedCategory().getOrDefault()
             }?.id ?: 0
@@ -408,9 +408,10 @@ class LibraryPresenter(
         i2: LibraryItem,
         lastReadManga: Map<Long, Int>
     ): Int {
-        return if (i1.manga.category == i2.manga.category) {
-            val category = allCategories.find { it.id == i1.manga.category } ?: return 0
-            if (category.mangaOrder.isNullOrEmpty() && category.mangaSort == null) {
+        return if (i1.header.category.id == i2.header.category.id) {
+            val category = i1.header.category
+            if (!category.isDynamic &&
+                category.mangaOrder.isNullOrEmpty() && category.mangaSort == null) {
                 category.changeSortTo(preferences.librarySortingMode().getOrDefault())
                 if (category.id == 0) preferences.defaultMangaOrder()
                     .set(category.mangaSort.toString())
@@ -465,8 +466,8 @@ class LibraryPresenter(
                 sortAlphabetical(i1, i2)
             } else compare
         } else {
-            val category = allCategories.find { it.id == i1.manga.category }?.order ?: -1
-            val category2 = allCategories.find { it.id == i2.manga.category }?.order ?: -1
+            val category = i1.header.category.order
+            val category2 = i2.header.category.order
             category.compareTo(category2)
         }
     }