diff --git a/src/app/pages/storage/modules/devices/components/disk-details-panel/disk-details-panel.component.ts b/src/app/pages/storage/modules/devices/components/disk-details-panel/disk-details-panel.component.ts
index d6fa134a0ed..551214db939 100644
--- a/src/app/pages/storage/modules/devices/components/disk-details-panel/disk-details-panel.component.ts
+++ b/src/app/pages/storage/modules/devices/components/disk-details-panel/disk-details-panel.component.ts
@@ -47,7 +47,7 @@ export class DiskDetailsPanelComponent {
   }
 
   get hasSmartTestSupport(): boolean {
-    return this.disksWithSmartTestSupport.includes(this.disk.devname);
+    return this.disk && this.disksWithSmartTestSupport.includes(this.disk.devname);
   }
 
   onCloseMobileDetails(): void {
diff --git a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.ts b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.ts
index 11f76ea742e..1f1650ad009 100644
--- a/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.ts
+++ b/src/app/pages/storage/modules/devices/components/zfs-info-card/raidz-extend-dialog/raidz-extend-dialog.component.ts
@@ -87,6 +87,9 @@ export class RaidzExtendDialogComponent {
 
     const minimumSize = this.data.vdev.children.reduce((acc, topologyDisk) => {
       const disk = diskDictionary[topologyDisk.disk];
+      if (!disk) {
+        return acc;
+      }
       return disk.size < acc ? disk.size : acc;
     }, Number.MAX_SAFE_INTEGER);