diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
index ac0f1dca8..00959eaf4 100644
--- a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
@@ -82,7 +82,10 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
         switch await timelineProvider.paginateBackwards(count) {
         case .success:
             return .success(())
-        case .failure:
+        case .failure(let error):
+            if error == .noMoreMessagesToBackPaginate {
+                return .success(())
+            }
             return .failure(.generic)
         }
     }
diff --git a/changelog.d/pr-399.bugfix b/changelog.d/pr-399.bugfix
new file mode 100644
index 000000000..e55ce594a
--- /dev/null
+++ b/changelog.d/pr-399.bugfix
@@ -0,0 +1 @@
+Avoid the "Failed to load messages" popup when all messages have been loaded.
\ No newline at end of file