diff --git a/src/components/ChattyLLM/ChattyLLMInputForm.vue b/src/components/ChattyLLM/ChattyLLMInputForm.vue
index 61c4ceaa..38524027 100644
--- a/src/components/ChattyLLM/ChattyLLMInputForm.vue
+++ b/src/components/ChattyLLM/ChattyLLMInputForm.vue
@@ -113,7 +113,7 @@
 							:aria-label="t('assistant', 'Retry response generation')"
 							:disabled="loading.initialMessages || loading.llmGeneration"
 							type="secondary"
-							@click="runGenerationTask">
+							@click="runGenerationTask(active.id)">
 							{{ t('assistant', 'Retry response generation') }}
 						</NcButton>
 					</div>
diff --git a/src/components/ChattyLLM/Message.vue b/src/components/ChattyLLM/Message.vue
index b279a59e..e836c988 100644
--- a/src/components/ChattyLLM/Message.vue
+++ b/src/components/ChattyLLM/Message.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div v-if="message.content"
+	<div
 		class="message"
 		@mouseover="showMessageActions = true"
 		@mouseleave="showMessageActions = false">
@@ -34,12 +34,11 @@
 			<NcDateTime class="message__header__timestamp" :timestamp="new Date((message?.timestamp ?? 0) * 1000)" :ignore-seconds="true" />
 		</div>
 		<NcRichText class="message__content"
-			:text="message.content"
+			:text="message.content || t('assistant', '(empty message)')"
 			:use-markdown="true"
 			:reference-limit="1"
 			:autolink="true" />
 	</div>
-	<div v-else />
 </template>
 
 <script>