diff --git a/komga/src/test/kotlin/org/gotson/komga/domain/persistence/BookRepositoryTest.kt b/komga/src/test/kotlin/org/gotson/komga/domain/persistence/BookRepositoryTest.kt
new file mode 100644
index 000000000..3ee618a83
--- /dev/null
+++ b/komga/src/test/kotlin/org/gotson/komga/domain/persistence/BookRepositoryTest.kt
@@ -0,0 +1,76 @@
+package org.gotson.komga.domain.persistence
+
+import org.assertj.core.api.Assertions.assertThat
+import org.gotson.komga.domain.model.BookMetadata
+import org.gotson.komga.domain.model.Status
+import org.gotson.komga.domain.model.makeBook
+import org.gotson.komga.domain.model.makeSerie
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager
+import org.springframework.data.domain.PageRequest
+import org.springframework.test.context.junit.jupiter.SpringExtension
+import org.springframework.transaction.annotation.Transactional
+
+@ExtendWith(SpringExtension::class)
+@DataJpaTest
+@Transactional
+class BookRepositoryTest(
+    @Autowired private val serieRepository: SerieRepository,
+    @Autowired private val bookRepository: BookRepository,
+    @Autowired private val entityManager: TestEntityManager
+) {
+
+  @AfterEach
+  fun `clear repository`() {
+    entityManager.clear()
+  }
+
+  @Test
+  fun `given many books with unordered index when fetching then books are ordered and paged`() {
+    val serie = makeSerie(
+        name = "serie",
+        books = (1..100 step 2).map { makeBook("$it") }
+    )
+    serieRepository.save(serie)
+
+    serie.books = serie.books.toMutableList().also { it.add(makeBook("2")) }
+    serieRepository.save(serie)
+
+    val pageable = PageRequest.of(0, 20)
+    val pageOfBooks = bookRepository.findAllBySerieId(serie.id, pageable)
+
+    assertThat(pageOfBooks.isFirst).isTrue()
+    assertThat(pageOfBooks.isLast).isFalse()
+    assertThat(pageOfBooks.size).isEqualTo(20)
+    assertThat(pageOfBooks.number).isEqualTo(0)
+    assertThat(pageOfBooks.content).hasSize(20)
+    assertThat(pageOfBooks.content.map { it.name }).startsWith("1", "2", "3", "5")
+  }
+
+  @Test
+  fun `given many books in ready state with unordered index when fetching then books are ordered and paged`() {
+    val serie = makeSerie(
+        name = "serie",
+        books = (1..100 step 2).map { makeBook("$it") }
+    )
+    serieRepository.save(serie)
+
+    serie.books = serie.books.toMutableList().also { it.add(makeBook("2")) }
+    serie.books.forEach { it.metadata = BookMetadata(Status.READY) }
+    serieRepository.save(serie)
+
+    val pageable = PageRequest.of(0, 20)
+    val pageOfBooks = bookRepository.findAllBySerieId(serie.id, pageable)
+
+    assertThat(pageOfBooks.isFirst).isTrue()
+    assertThat(pageOfBooks.isLast).isFalse()
+    assertThat(pageOfBooks.size).isEqualTo(20)
+    assertThat(pageOfBooks.number).isEqualTo(0)
+    assertThat(pageOfBooks.content).hasSize(20)
+    assertThat(pageOfBooks.content.map { it.name }).startsWith("1", "2", "3", "5")
+  }
+}
\ No newline at end of file