diff --git a/ts/textsecure/cds/RateLimitedError.ts b/ts/textsecure/cds/RateLimitedError.ts
index c64355057..9e7fcf0dc 100644
--- a/ts/textsecure/cds/RateLimitedError.ts
+++ b/ts/textsecure/cds/RateLimitedError.ts
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 export type RateLimitedErrorPayloadType = Readonly<{
-  // eslint-disable-next-line camelcase
   retry_after?: number;
 }>;
 
diff --git a/ts/views/conversation_view.tsx b/ts/views/conversation_view.tsx
index ea582e25d..e1e1b9763 100644
--- a/ts/views/conversation_view.tsx
+++ b/ts/views/conversation_view.tsx
@@ -2218,6 +2218,11 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
         limit,
       });
 
+    // Cache these messages in memory to ensure Lightbox can find them
+    messages.forEach(message => {
+      window.MessageController.register(message.id, message);
+    });
+
     const loadedRecentMediaItems = messages
       .filter(message => message.attachments !== undefined)
       .reduce(