diff --git a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
index dd0a7ee23f..8a17e5ff51 100644
--- a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
+++ b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
@@ -77,7 +77,9 @@ class DiffableTimelineLikeTableViewController<Section: Hashable & CaseIterable,
         
         let contentSections = snapshot.sectionIdentifiers.filter { timelineContentSections().contains($0) }
         let contentSectionIndices = contentSections.compactMap(snapshot.indexOfSection(_:))
-        let maxContentSectionIndex = contentSectionIndices.max()!
+        guard let maxContentSectionIndex = contentSectionIndices.max() else {
+            return
+        }
         
         if lastVisibleRow.section < maxContentSectionIndex {
             return