diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift
index ccb099d8e..e3450b4ad 100644
--- a/Session/Conversations/Message Cells/VisibleMessageCell.swift	
+++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift	
@@ -457,7 +457,7 @@ final class VisibleMessageCell: MessageCell, UITextViewDelegate, BodyTextViewDel
                         let quoteView: QuoteView = QuoteView(
                             for: .regular,
                             authorId: quote.authorId,
-                            quotedText: quote.body,
+                            quotedText: quote.body ?? "QUOTED_MESSAGE_NOT_FOUND".localized(),
                             threadVariant: cellViewModel.threadVariant,
                             currentUserPublicKey: cellViewModel.currentUserPublicKey,
                             currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey,
diff --git a/SessionMessagingKit/Shared Models/MessageViewModel.swift b/SessionMessagingKit/Shared Models/MessageViewModel.swift
index 69b28faff..753c50078 100644
--- a/SessionMessagingKit/Shared Models/MessageViewModel.swift	
+++ b/SessionMessagingKit/Shared Models/MessageViewModel.swift	
@@ -660,11 +660,12 @@ public extension MessageViewModel {
                     SELECT \(quote[.interactionId]),
                            \(quote[.authorId]),
                            \(quote[.timestampMs]),
+                           \(interaction[.body]) AS \(Quote.Columns.body),
+                           \(quote[.attachmentId])
                     FROM \(Quote.self)
-                    LEFT JOIN (
-                        SELECT \(interaction[.authorId]),
-                               \(interaction[.timestampMs]),
-                               \(interaction[.body]) 
+                    LEFT JOIN \(Interaction.self) ON (
+                        \(quote[.authorId]) = \(interaction[.authorId]) AND
+                        \(quote[.timestampMs]) = \(interaction[.timestampMs])
                     )
                 ) AS \(ViewModel.quoteKey) ON \(quote[.interactionId]) = \(interaction[.id])
                 LEFT JOIN \(Attachment.self) AS \(ViewModel.quoteAttachmentKey) ON \(ViewModel.quoteAttachmentKey).\(attachmentIdColumnLiteral) = \(quote[.attachmentId])