diff --git a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
index 597c3739..e38417de 100644
--- a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
@@ -115,8 +115,10 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                self.updateTimestamp()
+            if updateTimestampWorkItem == nil {
+                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                    self?.updateTimestamp()
+                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {
diff --git a/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift b/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
index aa112e75..b5f57ad1 100644
--- a/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift
@@ -104,8 +104,10 @@ class FollowNotificationGroupTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                self.updateTimestamp()
+            if updateTimestampWorkItem == nil {
+                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                    self?.updateTimestamp()
+                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {
diff --git a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
index a483b3ac..0f46fa47 100644
--- a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
@@ -78,8 +78,10 @@ class FollowRequestNotificationTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                self.updateTimestamp()
+            if updateTimestampWorkItem == nil {
+                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                    self?.updateTimestamp()
+                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {
diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.swift b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
index 4b0e0917..e586a36f 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
@@ -110,8 +110,10 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             delay = nil
         }
         if let delay = delay {
-            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                self.updateTimestamp()
+            if updateTimestampWorkItem == nil {
+                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                    self?.updateTimestamp()
+                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {