diff --git a/web/src/components/dataset/data-preview.tsx b/web/src/components/dataset/data-preview.tsx
index 76dafd15..12594518 100644
--- a/web/src/components/dataset/data-preview.tsx
+++ b/web/src/components/dataset/data-preview.tsx
@@ -581,7 +581,7 @@ export function DataPreview(props: { datasetId: string }) {
         transition={{ duration: 0.2 }}
         className="shadow-sm border relative min-h-[400px]"
       >
-        {!data || data.data.length === 0 ? (
+        {!data || data?.data?.length === 0 ? (
           <motion.div
             initial={{ opacity: 0 }}
             animate={{ opacity: 1 }}
@@ -614,7 +614,7 @@ export function DataPreview(props: { datasetId: string }) {
               </TableHeader>
               <TableBody>
                 <AnimatePresence mode="wait">
-                  {data.data.map((row, idx) => (
+                  {data?.data?.map((row, idx) => (
                     <MotionTableRow
                       key={idx}
                       initial={{ opacity: 0 }}
@@ -667,9 +667,9 @@ export function DataPreview(props: { datasetId: string }) {
             <PaginationItem>
               <PaginationNext
                 onClick={() => setCurrentPage((p) => p + 1)}
-                aria-disabled={!data || data.data.length < rowsPerPage}
+                aria-disabled={!data || data?.data?.length < rowsPerPage}
                 className={`cursor-pointer ${
-                  !data || data.data.length < rowsPerPage
+                  !data || data?.data?.length < rowsPerPage
                     ? "pointer-events-none opacity-50"
                     : ""
                 }`}
@@ -680,4 +680,4 @@ export function DataPreview(props: { datasetId: string }) {
       </motion.div>
     </div>
   );
-}
+}
\ No newline at end of file