diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetNextUnreadChapters.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetNextUnreadChapters.kt
index a6810c59e..a6d437d0b 100644
--- a/app/src/main/java/eu/kanade/domain/history/interactor/GetNextUnreadChapters.kt
+++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetNextUnreadChapters.kt
@@ -7,6 +7,7 @@ import eu.kanade.domain.history.repository.HistoryRepository
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.tachiyomi.util.chapter.getChapterSort
 import exh.source.MERGED_SOURCE_ID
+import exh.source.isEhBasedManga
 import kotlin.math.max
 
 class GetNextUnreadChapters(
@@ -31,6 +32,11 @@ class GetNextUnreadChapters(
                 .sortedWith(getChapterSort(manga, sortDescending = false))
                 .filterNot { it.read }
         }
+        if (manga.isEhBasedManga()) {
+            return getChapterByMangaId.await(mangaId)
+                .sortedWith(getChapterSort(manga, sortDescending = false))
+                .takeLast(1)
+        }
         // SY <--
         return getChapterByMangaId.await(mangaId)
             .sortedWith(getChapterSort(manga, sortDescending = false))
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 44d61b72e..107a59c3e 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
@@ -1058,9 +1058,9 @@ class MangaPresenter(
         if (successState.manga.isEhBasedManga()) {
             return successState.processedChapters.map { it.chapter }.let { chapters ->
                 if (successState.manga.sortDescending()) {
-                    chapters.firstOrNull()?.takeUnless { it.read }
+                    chapters.firstOrNull()
                 } else {
-                    chapters.lastOrNull()?.takeUnless { it.read }
+                    chapters.lastOrNull()
                 }
             }
         }