diff --git a/src/components/admin/machines/admin-machines-overview.tsx b/src/components/admin/machines/admin-machines-overview.tsx
index 591d5ee..003fb5a 100644
--- a/src/components/admin/machines/admin-machines-overview.tsx
+++ b/src/components/admin/machines/admin-machines-overview.tsx
@@ -631,9 +631,24 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
   const linuxExt = extended?.linux ?? null
   const windowsExt = extended?.windows ?? null
   const macosExt = extended?.macos ?? null
-  const windowsMemoryModules = Array.isArray(windowsExt?.memoryModules) ? windowsExt.memoryModules : []
-  const windowsVideoControllers = Array.isArray(windowsExt?.videoControllers) ? windowsExt.videoControllers : []
-  const windowsDiskEntries = Array.isArray(windowsExt?.disks) ? windowsExt.disks : []
+  const windowsMemoryModulesRaw = windowsExt?.memoryModules
+  const windowsVideoControllersRaw = windowsExt?.videoControllers
+  const windowsDiskEntriesRaw = windowsExt?.disks
+  const windowsMemoryModules = Array.isArray(windowsMemoryModulesRaw)
+    ? windowsMemoryModulesRaw
+    : windowsMemoryModulesRaw && typeof windowsMemoryModulesRaw === "object"
+      ? [windowsMemoryModulesRaw]
+      : []
+  const windowsVideoControllers = Array.isArray(windowsVideoControllersRaw)
+    ? windowsVideoControllersRaw
+    : windowsVideoControllersRaw && typeof windowsVideoControllersRaw === "object"
+      ? [windowsVideoControllersRaw]
+      : []
+  const windowsDiskEntries = Array.isArray(windowsDiskEntriesRaw)
+    ? windowsDiskEntriesRaw
+    : windowsDiskEntriesRaw && typeof windowsDiskEntriesRaw === "object"
+      ? [windowsDiskEntriesRaw]
+      : []
   const linuxLsblk = linuxExt?.lsblk ?? []
   const linuxSmartEntries = linuxExt?.smart ?? []
   const normalizedHardwareGpus = Array.isArray(hardware?.gpus)