diff --git a/src/server/machines-session.ts b/src/server/machines-session.ts
index a49d0cf..c21660a 100644
--- a/src/server/machines-session.ts
+++ b/src/server/machines-session.ts
@@ -65,11 +65,11 @@ export async function createMachineSession(machineToken: string, rememberMe = tr
     machine: {
       id: resolved.machine._id as Id<"machines">,
       hostname: resolved.machine.hostname,
-      osName: resolved.machine.osName,
-      osVersion: resolved.machine.osVersion,
-      architecture: resolved.machine.architecture,
-      status: resolved.machine.status,
-      lastHeartbeatAt: resolved.machine.lastHeartbeatAt,
+      osName: resolved.machine.osName ?? null,
+      osVersion: resolved.machine.osVersion ?? null,
+      architecture: resolved.machine.architecture ?? null,
+      status: resolved.machine.status ?? null,
+      lastHeartbeatAt: resolved.machine.lastHeartbeatAt ?? null,
       companyId: (resolved.machine.companyId ?? null) as Id<"companies"> | null,
       companySlug: resolved.machine.companySlug ?? null,
       metadata: (resolved.machine.metadata ?? null) as Record<string, unknown> | null,
@@ -78,4 +78,3 @@ export async function createMachineSession(machineToken: string, rememberMe = tr
     response: signIn.response,
   }
 }
-