diff --git a/src/components/admin/machines/admin-machines-overview.tsx b/src/components/admin/machines/admin-machines-overview.tsx
index ca25d3c..93e2a0b 100644
--- a/src/components/admin/machines/admin-machines-overview.tsx
+++ b/src/components/admin/machines/admin-machines-overview.tsx
@@ -1420,15 +1420,14 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
     ? readString(azureUserState, "AzureAdPrt") ??
       (azureUserState["AzureAdPrt"] ? String(azureUserState["AzureAdPrt"]) : undefined)
     : undefined
-  const defenderAntivirus = windowsExt.defender
-    ? parseBooleanLike(windowsExt.defender["AntivirusEnabled"] ?? windowsExt.defender["antivirusEnabled"])
+  const windowsDefender = windowsExt?.defender ?? null
+  const defenderAntivirus = windowsDefender
+    ? parseBooleanLike(windowsDefender["AntivirusEnabled"] ?? windowsDefender["antivirusEnabled"])
     : undefined
-  const defenderRealtime = windowsExt.defender
-    ? parseBooleanLike(
-        windowsExt.defender["RealTimeProtectionEnabled"] ?? windowsExt.defender["realTimeProtectionEnabled"],
-      )
+  const defenderRealtime = windowsDefender
+    ? parseBooleanLike(windowsDefender["RealTimeProtectionEnabled"] ?? windowsDefender["realTimeProtectionEnabled"])
     : undefined
-  const defenderMode = windowsExt.defender ? readString(windowsExt.defender, "AMRunningMode", "amRunningMode") : undefined
+  const defenderMode = windowsDefender ? readString(windowsDefender, "AMRunningMode", "amRunningMode") : undefined
   const windowsHotfixes = useMemo(() => {
     if (!Array.isArray(windowsExt?.hotfix)) return []
     return windowsExt.hotfix
@@ -2449,7 +2448,7 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
                             ) : null}
                           </div>
 
-                          {windowsExt.defender ? (
+                          {windowsDefender ? (
                             <div>
                               <p className="text-xs font-semibold uppercase text-slate-500">Defender</p>
                               <div className="mt-1 grid gap-1 text-xs text-muted-foreground">