diff --git a/src/BE/Controllers/Chats/Chats/ChatController.cs b/src/BE/Controllers/Chats/Chats/ChatController.cs
index 2c162464..e94e8aee 100644
--- a/src/BE/Controllers/Chats/Chats/ChatController.cs
+++ b/src/BE/Controllers/Chats/Chats/ChatController.cs
@@ -105,7 +105,8 @@ public async Task<IActionResult> StartConversationStreamed(
 
         // insert system message if it doesn't exist
         List<MessageLiteDto> systemMessages = new(capacity: req.Spans.Length + 1);
-        if (existingMessages.Count == 0)
+        bool isEmptyChat = existingMessages.Count == 0;
+        if (isEmptyChat)
         {
             if (req.AllSystemPromptSame && req.Spans[0].SystemPromptValid)
             {
@@ -187,6 +188,7 @@ public async Task<IActionResult> StartConversationStreamed(
         {
             db.Messages.Add(resp.AssistantMessage);
         }
+        if (isEmptyChat) chat.Title = request.UserMessage!.Text[..Math.Min(50, request.UserMessage.Text.Length)];
         await db.SaveChangesAsync(cancellationToken);
 
         // yield end messages
@@ -213,11 +215,7 @@ public async Task<IActionResult> StartConversationStreamed(
         }
 
         // yield title
-        if (existingMessages.Count == 0)
-        {
-            chat.Title = request.UserMessage!.Text[..Math.Min(50, request.UserMessage.Text.Length)];
-            await YieldTitle(chat.Title);
-        }
+        if (isEmptyChat) await YieldTitle(chat.Title);
         return new EmptyResult();
     }