diff --git a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
index 7ea9355f2c..fcfa9c79d2 100644
--- a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
+++ b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
@@ -156,8 +156,9 @@ class DiffableTimelineLikeTableViewController<Section: Hashable & CaseIterable,
         // this assumes that indexPathsForVisibleRows is always in order
         lastLastVisibleRow = tableView.indexPathsForVisibleRows?.last
         
-        let orderedContentSections = dataSource.snapshot().sectionIdentifiers.filter { timelineContentSections().contains($0) }
-        if indexPath.section == orderedContentSections.count - 1,
+        let orderedContentSections = dataSource.snapshot().sectionIdentifiers.enumerated().filter { timelineContentSections().contains($0.element) }
+        if let lastContentSection = orderedContentSections.last,
+           indexPath.section == lastContentSection.offset,
            indexPath.row == tableView.numberOfRows(inSection: indexPath.section) - 1 {
             
             loadOlder()