diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index 5b128df30b..27806249dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -73,7 +73,7 @@ internal class TokenChunkEventPersistor @Inject constructor(
         if (receivedChunk.events.isEmpty() && receivedChunk.start == receivedChunk.end) {
             Timber.w("Discard empty chunk with identical start/end token ${receivedChunk.start}")
 
-            if (receivedChunk.hasMore()) {
+            return if (receivedChunk.hasMore()) {
                 Result.SHOULD_FETCH_MORE
             } else {
                 Result.REACHED_END