diff --git a/package-lock.json b/package-lock.json
index 173ffeb2..2d106dc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aws/mynah-ui",
-  "version": "2.0.0-beta.13.5",
+  "version": "2.0.0-beta.13.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws/mynah-ui",
-      "version": "2.0.0-beta.13.5",
+      "version": "2.0.0-beta.13.6",
       "license": "Apache License 2.0",
       "dependencies": {
         "escape-html": "^1.0.3",
diff --git a/package.json b/package.json
index 84c5dc73..445aee82 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/mynah-ui",
   "displayName": "AWS Mynah UI",
-  "version": "2.0.0-beta.13.5",
+  "version": "2.0.0-beta.13.6",
   "description": "AWS Tookit VSCode and Intellij IDE Extension Mynah UI",
   "publisher": "Amazon Web Services",
   "license": "Apache License 2.0",
diff --git a/src/components/chat-item/chat-item-followup.ts b/src/components/chat-item/chat-item-followup.ts
index ef5d6ea4..105415f8 100644
--- a/src/components/chat-item/chat-item-followup.ts
+++ b/src/components/chat-item/chat-item-followup.ts
@@ -48,7 +48,7 @@ export class ChatItemFollowUpContainer {
               events: {
                 click: (e) => {
                   this.hideCroppedFollowupText();
-                  MynahUIGlobalEvents.getInstance().dispatch(MynahEventNames.FOLLOW_UP_CLICKED, { tabId: this.props.tabId, followUpOption });
+                  MynahUIGlobalEvents.getInstance().dispatch(MynahEventNames.FOLLOW_UP_CLICKED, { tabId: this.props.tabId, messageId: this.props.chatItem.messageId, followUpOption });
                   if ((this.render.parentElement as ExtendedHTMLElement)?.hasClass('mynah-chat-item-empty')) {
                     this.render.parentElement?.remove();
                   };