diff --git a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
index 3f5a71c1..d98d52d8 100644
--- a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
+++ b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
@@ -19,6 +19,20 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
       channel: thread,
     };
 
+    const sourceChannel = pluginData.client.channels.cache.find((c) => c.id === thread.parentId);
+    if (sourceChannel?.isText()) {
+      const sourceMessage = sourceChannel.messages.cache.find(
+        (m) => m.thread?.id === thread.id || m.reference?.channelId === thread.id,
+      );
+      if (sourceMessage) {
+        const message = await pluginData.state.savedMessages.find(sourceMessage.id);
+        if (message) {
+          message.channel_id = thread.id;
+          context.message = message;
+        }
+      }
+    }
+
     pluginData.state.queue.add(() => {
       pluginData.state.recentActions.push({
         type: RecentActionType.ThreadCreate,