diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index 454fc4a4a..b4deba5c0 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -495,9 +495,9 @@ fill_vdev_info_real (struct grub_zfs_data *data,
 	  fill->vdev_phys_sector = insert->vdev_phys_sector;
 	  fill->current_uberblock = insert->current_uberblock;
 	  fill->original = insert->original;
+	  if (!data->device_original)
+	    data->device_original = fill;
 	}
-      if (!data->device_original)
-	data->device_original = fill;
 
       return GRUB_ERR_NONE;
     }