diff --git a/src/app/messages/page.tsx b/src/app/messages/page.tsx
index bb51294..7362ae2 100644
--- a/src/app/messages/page.tsx
+++ b/src/app/messages/page.tsx
@@ -53,7 +53,17 @@ export default function MessagesPage() {
       const res = await fetch('/api/auth/me');
       if (res.ok) {
         const data = await res.json();
-        setUser(data.user);
+        if (data.authenticated) {
+          setUser({
+            id: data.id,
+            username: data.username,
+            first_name: data.first_name,
+            last_name: data.last_name,
+            role: data.role,
+          });
+        } else {
+          window.location.href = '/login';
+        }
       } else {
         window.location.href = '/login';
       }