diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
index a620d0124..49cf6149d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
@@ -891,10 +891,19 @@ class MangaPresenter(
      * Returns the next unread chapter or null if everything is read.
      */
     fun getNextUnreadChapter(): ChapterItem? {
+        val chapters = chapters.sortedWith(getChapterSort())
         return if (source.isEhBasedSource()) {
-            chapters.sortedWith(getChapterSort()).firstOrNull()?.takeUnless { it.read }
+            if (sortDescending()) {
+                chapters.firstOrNull()?.takeUnless { it.read }
+            } else {
+                chapters.lastOrNull()?.takeUnless { it.read }
+            }
         } else {
-            chapters.sortedWith(getChapterSort()).findLast { !it.read }
+            if (sortDescending()) {
+                return chapters.findLast { !it.read }
+            } else {
+                chapters.find { !it.read }
+            }
         }
     }