diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift
index f6cc39efe..716bec390 100644
--- a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift	
+++ b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift	
@@ -155,8 +155,10 @@ public final class LokiPublicChatPoller : NSObject {
                 guard let messageID = message.uniqueId else { return print("[Loki] Failed to save public chat message.") }
                 storage.setIDForMessageWithServerID(UInt(messageServerID), to: messageID, in: transaction)
             }
-            if let linkPreviewURL = OWSLinkPreview.previewUrl(forMessageBodyText: message.body, selectedRange: nil) {
-                message.generateLinkPreviewIfNeeded(fromURL: linkPreviewURL)
+            DispatchQueue.main.async {
+                if let linkPreviewURL = OWSLinkPreview.previewUrl(forMessageBodyText: message.body, selectedRange: nil) {
+                    message.generateLinkPreviewIfNeeded(fromURL: linkPreviewURL)
+                }
             }
         }
         // Poll