diff --git a/Tusker/Screens/Conversation/ConversationTableViewController.swift b/Tusker/Screens/Conversation/ConversationTableViewController.swift
index efc1b926..fb5c99cc 100644
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@@ -19,7 +19,13 @@ class ConversationTableViewController: EnhancedTableViewController {
     
     let mainStatusID: String
     let mainStatusState: StatusState
-    var statuses: [(id: String, state: StatusState)] = []
+    var statuses: [(id: String, state: StatusState)] = [] {
+        didSet {
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+            }
+        }
+    }
     
     var showStatusesAutomatically = false
     var visibilityBarButtonItem: UIBarButtonItem!
@@ -63,12 +69,6 @@ class ConversationTableViewController: EnhancedTableViewController {
             self.statuses = parents.map { ($0.id, .unknown) } + self.statuses + context.descendants.map { ($0.id, .unknown) }
             let indexPath = IndexPath(row: parents.count, section: 0)
             DispatchQueue.main.async {
-                let ancestorsIndexPaths = (0..<parents.count).map { IndexPath(row: $0, section: 0) }
-                let descendantsIndexPaths = ((parents.count + 1)..<(self.statuses.count)).map { IndexPath(row: $0, section: 0) }
-                // despite its name, UITableView.RowAnimation.none actually uses the automatic animation, so we force-disable it
-                UIView.performWithoutAnimation {
-                    self.tableView.insertRows(at: ancestorsIndexPaths + descendantsIndexPaths, with: .none)
-                }
                 self.tableView.scrollToRow(at: indexPath, at: .middle, animated: false)
             }
         }