diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 7ee51d86f..d94bf3199 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -1606,9 +1606,15 @@ extension ConversationVC:
             
             if
                 let quote = try? interaction.quote.fetchOne(db),
-                let quotedInteraction = try? quote.interaction.fetchOne(db)
+                let quotedAttachment = try? quote.attachment.fetchOne(db),
+                quotedAttachment.isVisualMedia,
+                quotedAttachment.downloadUrl == Attachment.nonMediaQuoteFileId,
+                let quotedInteraction = try? quote.originalInteraction.fetchOne(db)
             {
-                
+                let attachment = try? quotedInteraction.attachments.fetchAll(db).first
+                try quote.with(
+                    attachmentId: attachment?.cloneAsQuoteThumbnail()?.inserted(db).id
+                ).update(db)
             }
             
             try MessageSender.send(
diff --git a/SessionMessagingKit/Database/Models/Attachment.swift b/SessionMessagingKit/Database/Models/Attachment.swift
index c91686a17..fc004c92e 100644
--- a/SessionMessagingKit/Database/Models/Attachment.swift
+++ b/SessionMessagingKit/Database/Models/Attachment.swift
@@ -885,16 +885,13 @@ extension Attachment {
         
         guard
             self.isValid,
+            self.isVisualMedia,
             let thumbnailPath: String = Attachment.originalFilePath(
                 id: cloneId,
                 mimeType: OWSMimeTypeImageJpeg,
                 sourceFilename: thumbnailName
             )
         else {
-            return nil
-        }
-        
-        guard self.isVisualMedia else {
             // Non-media files cannot have thumbnails but may be sent as quotes, in these cases we want
             // to create an attachment in an 'uploaded' state with a hard-coded file id so the messageSend
             // job doesn't try to upload the attachment (we include the original `serverId` as it's
diff --git a/SessionMessagingKit/Database/Models/Quote.swift b/SessionMessagingKit/Database/Models/Quote.swift
index af92ee454..1b702ecf1 100644
--- a/SessionMessagingKit/Database/Models/Quote.swift
+++ b/SessionMessagingKit/Database/Models/Quote.swift
@@ -76,6 +76,26 @@ public struct Quote: Codable, Equatable, Hashable, FetchableRecord, PersistableR
     }
 }
 
+// MARK: - Mutation
+
+public extension Quote {
+    func with(
+        interactionId: Int64? = nil,
+        authorId: String? = nil,
+        timestampMs: Int64? = nil,
+        body: String? = nil,
+        attachmentId: String? = nil
+    ) -> Quote {
+        return Quote(
+            interactionId: interactionId ?? self.interactionId,
+            authorId: authorId ?? self.authorId,
+            timestampMs: timestampMs ?? self.timestampMs,
+            body: body ?? self.body,
+            attachmentId: attachmentId ?? self.attachmentId
+        )
+    }
+}
+
 // MARK: - Protobuf
 
 public extension Quote {