diff --git a/src/app/api/machines/session/route.ts b/src/app/api/machines/session/route.ts
index 7322de7..5655b5a 100644
--- a/src/app/api/machines/session/route.ts
+++ b/src/app/api/machines/session/route.ts
@@ -73,7 +73,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const context = (await client.query(api.machines.getContext, {
+    let context = (await client.query(api.machines.getContext, {
       machineId,
     })) as {
       id: string
@@ -120,6 +120,14 @@ export async function GET(request: NextRequest) {
             assignedUserName: ensuredAssignedUserName ?? undefined,
             assignedUserRole: (ensuredAssignedUserRole ?? context.persona ?? "collaborator").toUpperCase(),
           })
+
+          context = (await client.query(api.machines.getContext, {
+            machineId,
+          })) as typeof context
+
+          ensuredAssignedUserId = context.assignedUserId ?? ensuredAssignedUserId
+          ensuredAssignedUserName = context.assignedUserName ?? ensuredAssignedUserName
+          ensuredAssignedUserRole = context.assignedUserRole ?? ensuredAssignedUserRole
         }
       } catch (error) {
         console.error("[machines.session] Falha ao garantir usuário vinculado", error)