diff --git a/Mastodon/Protocol/TableViewCellHeightCacheableContainer.swift b/Mastodon/Protocol/TableViewCellHeightCacheableContainer.swift
index ce5e453cd..7c851cadc 100644
--- a/Mastodon/Protocol/TableViewCellHeightCacheableContainer.swift
+++ b/Mastodon/Protocol/TableViewCellHeightCacheableContainer.swift
@@ -22,7 +22,7 @@ extension TableViewCellHeightCacheableContainer {
     }
 
     func handleTableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-        guard let item = item(for: nil, indexPath: indexPath) else { return 200 }
+        guard let item = item(for: nil, indexPath: indexPath) else { return UITableView.automaticDimension }
         guard let frame = cellFrameCache.object(forKey: NSNumber(value: item.hashValue))?.cgRectValue else {
             if case .bottomLoader = item {
                 return TimelineLoaderTableViewCell.cellHeight