diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
index e15f717717..94465a6f29 100644
--- a/frontend/openchat-agent/src/services/openchatAgent.ts
+++ b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -1094,9 +1094,7 @@ export class OpenChatAgent extends EventTarget {
                         eventIndex: idx,
                         edited: msg.edited,
                         isThreadRoot: msg.thread !== undefined,
-                        sourceContext: ev.event.repliesTo.sourceContext ?? {
-                            chatId: { ...defaultChatId },
-                        },
+                        sourceContext: messageContext,
                     };
                 } else {
                     this._logger.log(