diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
index 6abf917ab0..0e18b62acd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
@@ -33,7 +33,8 @@ internal fun getBetsChunkSize(listSize: Int, limit: Int): BestChunkSize {
         )
     } else {
         val numberOfChunks = ceil(listSize / limit.toDouble()).toInt()
-        val chunkSize = listSize / numberOfChunks
+        // Round on next Int
+        val chunkSize = ceil(listSize / numberOfChunks.toDouble()).toInt()
 
         BestChunkSize(
                 numberOfChunks = numberOfChunks,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
index 7cb355a621..f684d93310 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
@@ -42,10 +42,10 @@ class MathUtilTest : MatrixTest {
     fun testGetBestChunkSize100() = doTest(100, 100, 1, 100)
 
     @Test
-    fun testGetBestChunkSize101() = doTest(101, 100, 2, 50)
+    fun testGetBestChunkSize101() = doTest(101, 100, 2, 51)
 
     @Test
-    fun testGetBestChunkSize199() = doTest(199, 100, 2, 99)
+    fun testGetBestChunkSize199() = doTest(199, 100, 2, 100)
 
     @Test
     fun testGetBestChunkSize200() = doTest(200, 100, 2, 100)