diff --git a/src/telegram/bot-message-context.ts b/src/telegram/bot-message-context.ts
index abd06cdef..73659f97d 100644
--- a/src/telegram/bot-message-context.ts
+++ b/src/telegram/bot-message-context.ts
@@ -656,7 +656,8 @@ export const buildTelegramMessageContext = async ({
     msg,
     chatId,
     isGroup,
-    resolvedThreadId,
+    // For DM reply threads use messageThreadId; for forum groups use resolvedThreadId
+    resolvedThreadId: isGroup ? resolvedThreadId : messageThreadId,
     isForum,
     historyKey,
     historyLimit,