diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineTableViewController.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineTableViewController.swift
index a32e25647..b6a7c0e8b 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineTableViewController.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineTableViewController.swift
@@ -178,8 +178,10 @@ class TimelineTableViewController: UIViewController {
             cell.contentView.transform = CGAffineTransform(scaleX: 1, y: -1)
             return cell
         }
-
-        dataSource?.defaultRowAnimation = .fade
+        
+        // We only animate when there's a new last message, so its safe
+        // to animate from the bottom (which is the top as we're flipped).
+        dataSource?.defaultRowAnimation = .top
         tableView.delegate = self
     }