diff --git a/src/lib/components/chat/ContentRenderer/FloatingButtons.svelte b/src/lib/components/chat/ContentRenderer/FloatingButtons.svelte
index 819bf75462..ee922f43b1 100644
--- a/src/lib/components/chat/ContentRenderer/FloatingButtons.svelte
+++ b/src/lib/components/chat/ContentRenderer/FloatingButtons.svelte
@@ -15,6 +15,8 @@
 	import Skeleton from '../Messages/Skeleton.svelte';
 
 	export let id = '';
+	export let messageId = '';
+
 	export let model = null;
 	export let messages = [];
 	export let actions = [];
@@ -211,7 +213,7 @@
 
 		onAdd({
 			modelId: model,
-			parentId: id,
+			parentId: messageId,
 			messages: messages
 		});
 	};
diff --git a/src/lib/components/chat/Messages/ContentRenderer.svelte b/src/lib/components/chat/Messages/ContentRenderer.svelte
index f2f5f2259f..feaa3501cb 100644
--- a/src/lib/components/chat/Messages/ContentRenderer.svelte
+++ b/src/lib/components/chat/Messages/ContentRenderer.svelte
@@ -17,7 +17,10 @@
 
 	export let id;
 	export let content;
+
 	export let history;
+	export let messageId;
+
 	export let selectedModels = [];
 
 	export let done = true;
@@ -196,6 +199,7 @@
 	<FloatingButtons
 		bind:this={floatingButtonsElement}
 		{id}
+		{messageId}
 		actions={$settings?.floatingActionButtons ?? []}
 		model={(selectedModels ?? []).includes(model?.id)
 			? model?.id
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 62460baf2c..83e717c577 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -800,6 +800,7 @@
 									<!-- unless message.error === true which is legacy error handling, where the error message is stored in message.content -->
 									<ContentRenderer
 										id={`${chatId}-${message.id}`}
+										messageId={message.id}
 										{history}
 										{selectedModels}
 										content={message.content}