diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 07797f321..284c88d6c 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -511,6 +511,7 @@ export class App {
             const chatId = req.query?.chatId as string | undefined
             const memoryType = req.query?.memoryType as string | undefined
             const sessionId = req.query?.sessionId as string | undefined
+            const messageId = req.query?.messageId as string | undefined
             const startDate = req.query?.startDate as string | undefined
             const endDate = req.query?.endDate as string | undefined
             let chatTypeFilter = req.query?.chatType as chatType | undefined
@@ -538,7 +539,8 @@ export class App {
                 memoryType,
                 sessionId,
                 startDate,
-                endDate
+                endDate,
+                messageId
             )
             return res.json(chatmessages)
         })
@@ -1440,7 +1442,8 @@ export class App {
         memoryType?: string,
         sessionId?: string,
         startDate?: string,
-        endDate?: string
+        endDate?: string,
+        messageId?: string
     ): Promise<ChatMessage[]> {
         let fromDate
         if (startDate) fromDate = new Date(startDate)
@@ -1455,7 +1458,8 @@ export class App {
                 chatId,
                 memoryType: memoryType ?? (chatId ? IsNull() : undefined),
                 sessionId: sessionId ?? undefined,
-                createdDate: toDate && fromDate ? Between(fromDate, toDate) : undefined
+                createdDate: toDate && fromDate ? Between(fromDate, toDate) : undefined,
+                id: messageId ?? undefined
             },
             order: {
                 createdDate: sortOrder === 'DESC' ? 'DESC' : 'ASC'