diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 62d9e6074..b449b77db 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -837,8 +837,9 @@ NS_ASSUME_NONNULL_BEGIN
     stillImageView.backgroundColor = [UIColor whiteColor];
     [self addAttachmentUploadViewIfNecessary];
 
-    __weak OWSMessageBubbleView *weakSelf = self;
     __weak UIImageView *weakImageView = stillImageView;
+
+    __weak OWSMessageBubbleView *weakSelf = self;
     self.loadCellContentBlock = ^{
         OWSMessageBubbleView *strongSelf = weakSelf;
         if (!strongSelf) {
@@ -979,7 +980,6 @@ NS_ASSUME_NONNULL_BEGIN
     }];
 
     __weak OWSMessageBubbleView *weakSelf = self;
-    __weak UIImageView *weakImageView = stillImageView;
     self.loadCellContentBlock = ^{
         OWSMessageBubbleView *strongSelf = weakSelf;
         if (!strongSelf) {
@@ -990,22 +990,6 @@ NS_ASSUME_NONNULL_BEGIN
             return;
         }
         stillImageView.image = [strongSelf
-            tryToLoadCellMedia:^{
-                OWSCAssert([strongSelf.attachmentStream isImage]);
-                return [strongSelf.attachmentStream
-                    thumbnailImageMediumWithSuccess:^(UIImage *image) {
-                        weakImageView.image = image;
-                    }
-                    failure:^{
-                        DDLogError(@"Could not load thumbnail.");
-                    }];
-            }
-                     mediaView:stillImageView
-                      cacheKey:strongSelf.attachmentStream.uniqueId
-               shouldSkipCache:shouldSkipCache
-                  canLoadAsync:YES];
-
-
             tryToLoadCellMedia:^{
                 OWSCAssert([strongSelf.attachmentStream isVideo]);