diff --git a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
index 71b9fbd7..966f8255 100644
--- a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
+++ b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
@@ -6,7 +6,6 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
   event: "threadCreate",
   async listener({ pluginData, args: { thread } }) {
     const user = thread.ownerId ? await pluginData.client.users.fetch(thread.ownerId).catch(() => void 0) : void 0;
-
     const context: AutomodContext = {
       timestamp: Date.now(),
       threadChange: {
@@ -14,6 +13,19 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
       },
       user,
     };
+    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(() => {
       runAutomod(pluginData, context);