diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
index b442fcfaa..deda1f9dd 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
+++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
@@ -214,11 +214,15 @@ public class ConversationMediaView: UIView {
         loadBlock = { [weak self] in
             AssertIsOnMainThread()
 
+            guard let strongSelf = self else {
+                return
+            }
+
             if animatedImageView.image != nil {
                 owsFailDebug("Unexpectedly already loaded.")
                 return
             }
-            self?.tryToLoadMedia(loadMediaBlock: { () -> AnyObject? in
+            strongSelf.tryToLoadMedia(loadMediaBlock: { () -> AnyObject? in
                 guard attachmentStream.isValidImage else {
                     owsFailDebug("Ignoring invalid attachment.")
                     return nil