diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.swift b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
index afad3c10..abf03d78 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
@@ -58,7 +58,8 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
                 .filter { [unowned self] in $0 == self.rebloggerID }
                 .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
-                    if let reblogger = self.mastodonController.persistentContainer.account(for: $0) {
+                    if let mastodonController = self.mastodonController,
+                       let reblogger = mastodonController.persistentContainer.account(for: $0) {
                         self.updateRebloggerLabel(reblogger: reblogger)
                     }
             }