diff --git a/src/frontend/src/features/rooms/components/Join.tsx b/src/frontend/src/features/rooms/components/Join.tsx
index 895f4b1a..e8be67a5 100644
--- a/src/frontend/src/features/rooms/components/Join.tsx
+++ b/src/frontend/src/features/rooms/components/Join.tsx
@@ -316,7 +316,7 @@ export const Join = ({
     refetch: refetchRoom,
   } = useQuery({
     queryKey: [keys.room, roomId],
-    queryFn: () => fetchRoom({ roomId, username }),
+    queryFn: () => fetchRoom({ roomId, username: username || user?.full_name }),
     staleTime: 6 * 60 * 60 * 1000, // By default, LiveKit access tokens expire 6 hours after generation
     retry: false,
     enabled: false,
@@ -339,7 +339,7 @@ export const Join = ({
 
   const { status, startWaiting } = useLobby({
     roomId,
-    username,
+    username: username || user?.full_name,
     onAccepted: handleAccepted,
   })