diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
index 6082e6d012..04a9dbaf6a 100644
--- a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
@@ -238,7 +238,9 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
     
     @objc private func contentSizeCategoryDidChange() {
         // Recompute all attributed strings on content size changes -> DynamicType support
-        updateTimelineItems()
+        serialDispatchQueue.async {
+            self.updateTimelineItems()
+        }
     }
     
     private func updateTimelineItems() {
@@ -303,7 +305,9 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
             }
         }
         
-        timelineItems = newTimelineItems
+        DispatchQueue.main.sync {
+            timelineItems = newTimelineItems
+        }
         
         callbacks.send(.updatedTimelineItems)
         callbacks.send(.canBackPaginate(canBackPaginate))