diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
index 3ae47d2e7..984c3c6a2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
@@ -119,10 +119,8 @@ class HistoryPresenter : BasePresenter<HistoryController>() {
                     }
             }
             Manga.SORTING_UPLOAD_DATE -> {
-                val dateUpload = chapter.date_upload
-                ((currChapterIndex + 1) until chapters.size)
-                    .map { chapters[it] }
-                    .firstOrNull { it.date_upload > dateUpload }
+                chapters.drop(currChapterIndex + 1)
+                        .firstOrNull { it.date_upload >= chapter.date_upload}
             }
             else -> throw NotImplementedError("Unknown sorting method")
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef12c49df..f401c1782 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -473,7 +473,7 @@
     <string name="sorting_mode">Sorting mode</string>
     <string name="sort_by_source">By source</string>
     <string name="sort_by_number">By chapter number</string>
-    <string name="sort_by_upload_date">By chapter upload date</string>
+    <string name="sort_by_upload_date">By upload date</string>
     <string name="manga_download">Download</string>
     <string name="custom_download">Download custom amount</string>
     <string name="download_1">Next chapter</string>