diff --git a/src/components/ChatPanel.tsx b/src/components/ChatPanel.tsx
index 8faf9a4..7248210 100644
--- a/src/components/ChatPanel.tsx
+++ b/src/components/ChatPanel.tsx
@@ -131,7 +131,8 @@ export function ChatPanel({ dmUserId, spotId, spotRoomName }: ChatPanelProps) {
   );
 
   useEffect(() => {
-    if (!user) {
+    const userId = user?.id;
+    if (!userId) {
       setCityRoomId(null);
       setSpotRoomId(null);
       setDmRoomId(null);
@@ -145,7 +146,7 @@ export function ChatPanel({ dmUserId, spotId, spotRoomName }: ChatPanelProps) {
       if (cancelled) return;
       if (cityId) {
         setCityRoomId(cityId);
-        await ensureRoomMember(cityId, user.id);
+        await ensureRoomMember(cityId, userId);
         const count = await fetchRoomMemberCount(cityId);
         if (!cancelled) setMemberCount(count);
       }
@@ -157,15 +158,15 @@ export function ChatPanel({ dmUserId, spotId, spotRoomName }: ChatPanelProps) {
         const sId = await getOrCreateSpotRoom(spotId, spotName);
         if (!cancelled && sId) {
           setSpotRoomId(sId);
-          await ensureRoomMember(sId, user.id);
+          await ensureRoomMember(sId, userId);
         }
       }
 
       if (dmUserId) {
-        const dId = await getOrCreateDmRoom(user.id, dmUserId);
+        const dId = await getOrCreateDmRoom(userId, dmUserId);
         if (!cancelled && dId) {
           setDmRoomId(dId);
-          await ensureRoomMember(dId, user.id);
+          await ensureRoomMember(dId, userId);
         }
       }
     }