diff --git a/package.json b/package.json
index 46ec24f..f28fa2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ai-chatbot",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "private": true,
   "scripts": {
     "dev": "next dev --turbo",
diff --git a/tests/e2e/chat.test.ts b/tests/e2e/chat.test.ts
index 07f9147..9e73342 100644
--- a/tests/e2e/chat.test.ts
+++ b/tests/e2e/chat.test.ts
@@ -141,11 +141,12 @@ test.describe('Chat activity', () => {
 
   test('Create message from url query', async ({ page }) => {
     await page.goto('/?query=Why is the sky blue?');
-    const userMessage = await chatPage.getRecentUserMessage();
-    expect(userMessage.content).toBe('Why is the sky blue?');
 
     await chatPage.isGenerationComplete();
 
+    const userMessage = await chatPage.getRecentUserMessage();
+    expect(userMessage.content).toBe('Why is the sky blue?');
+
     const assistantMessage = await chatPage.getRecentAssistantMessage();
     expect(assistantMessage.content).toContain("It's just blue duh!");
   });
diff --git a/tests/pages/chat.ts b/tests/pages/chat.ts
index f88a06b..da4ac6d 100644
--- a/tests/pages/chat.ts
+++ b/tests/pages/chat.ts
@@ -150,7 +150,11 @@ export class ChatPage {
 
   async getRecentUserMessage() {
     const messageElements = await this.page.getByTestId('message-user').all();
-    const lastMessageElement = messageElements[messageElements.length - 1];
+    const lastMessageElement = messageElements.at(-1);
+
+    if (!lastMessageElement) {
+      throw new Error('No user message found');
+    }
 
     const content = await lastMessageElement
       .getByTestId('message-content')