diff --git a/apps/web/src/__tests__/Messages.test.tsx b/apps/web/src/__tests__/Messages.test.tsx
index b432e7d..c37db80 100644
--- a/apps/web/src/__tests__/Messages.test.tsx
+++ b/apps/web/src/__tests__/Messages.test.tsx
@@ -96,7 +96,7 @@ describe("MessagesPage", () => {
     vi.mocked(global.fetch).mockImplementation((input) => {
       const url = String(input);
       if (url === "/api/conversations?limit=20") {
-        return Promise.resolve(makeResponse(mockConversations));
+        return Promise.resolve(makeResponse({ items: mockConversations, nextCursor: null }));
       }
       if (url === "/api/conversations/conv-1/messages?limit=50") {
         return Promise.resolve(makeResponse({ items: mockMessages, nextCursor: null }));
@@ -110,7 +110,7 @@ describe("MessagesPage", () => {
     fireEvent.click(screen.getByText("Alice Smith"));
 
     await waitFor(() => {
-      expect(screen.getByText("Hello, is my dog ready?")).toBeInTheDocument();
+      expect(screen.getAllByText("Hello, is my dog ready?").length).toBeGreaterThanOrEqual(1);
       expect(screen.getByText("Yes, she is all done!")).toBeInTheDocument();
     });
   });
@@ -130,7 +130,7 @@ describe("MessagesPage", () => {
           sentByStaffId: "staff-1",
         }, 201));
       }
-      return Promise.resolve(makeResponse(mockConversations));
+      return Promise.resolve(makeResponse({ items: mockConversations, nextCursor: null }));
     });
 
     render(<MessagesPage />);
diff --git a/apps/web/src/pages/Messages.tsx b/apps/web/src/pages/Messages.tsx
index df73f73..59f648e 100644
--- a/apps/web/src/pages/Messages.tsx
+++ b/apps/web/src/pages/Messages.tsx
@@ -93,7 +93,7 @@ export function MessagesPage() {
 
   useEffect(() => {
     if (messages.length > 0) {
-      messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+      messagesEndRef.current?.scrollIntoView?.({ behavior: "smooth" });
     }
   }, [messages]);