diff --git a/models/core/ai/llm.py b/models/core/ai/llm.py
index b0098e2..fe18f40 100644
--- a/models/core/ai/llm.py
+++ b/models/core/ai/llm.py
@@ -259,6 +259,7 @@ class LLMOutput(BaseModel):
 
     def to_json(self) -> dict:
         dump = self.model_dump()
+        print("DUMP:", dump)
         dump["invocationId"] = str(dump["invocationId"])
         return dump
 
diff --git a/models/core/message.py b/models/core/message.py
index b6cabb5..8c1bdd6 100644
--- a/models/core/message.py
+++ b/models/core/message.py
@@ -207,7 +207,7 @@ class CoreMessageModel(BaseModel):
 
     @property
     def full(self):
-        return {
+        full_json = {
             "messageId": str(self.messageId),
             "ts": self.ts.isoformat(),
             "serviceType": self.serviceType,
@@ -224,10 +224,13 @@ class CoreMessageModel(BaseModel):
             "aiSnippet": self.aiSnippet.to_json() if isinstance(self.aiSnippet, LLMOutput) else self.aiSnippet,
             "tags": self.tags
         }
+        if full_json["aiSnippet"]:
+            full_json["aiSnippet"]["invocationId"] = str(full_json["aiSnippet"]["invocationId"])
+        return full_json
 
     @property
     def preview(self):
-        return {
+        preview_json = {
             "messageId": str(self.messageId),
             "ts": self.ts.isoformat(),
             "serviceType": self.serviceType,
@@ -243,6 +246,9 @@ class CoreMessageModel(BaseModel):
             "aiSnippet": self.aiSnippet.to_json() if isinstance(self.aiSnippet, LLMOutput) else self.aiSnippet,
             "tags": self.tags
         }
+        if preview_json["aiSnippet"]:
+            preview_json["aiSnippet"]["invocationId"] = str(preview_json["aiSnippet"]["invocationId"])
+        return preview_json
 
     # ┓┏  ┓• ┓   •
     # ┃┃┏┓┃┓┏┫┏┓╋┓┏┓┏┓