diff --git a/frontend/app/app/assistant.tsx b/frontend/app/app/assistant.tsx
index c94e2c0..5ae90cf 100644
--- a/frontend/app/app/assistant.tsx
+++ b/frontend/app/app/assistant.tsx
@@ -41,13 +41,16 @@ export const Assistant = () => {
 						messages.length > 1 ? selectedSessionId : null;
 					const outgoingSessionId =
 						lastSessionId ?? selectedResumeSessionId ?? options.id;
+					const lastUserMessage = [...messages]
+						.reverse()
+						.find((message) => message.role === "user");
 					writeActiveSessionId(outgoingSessionId);
 
 					return {
 						body: {
 							...body,
 							id: options.id,
-							messages,
+							messages: lastUserMessage ? [lastUserMessage] : [],
 							resumeSessionId:
 								lastSessionId ?? selectedResumeSessionId ?? undefined,
 						},