diff --git a/src/webviews/extension-side/dataframe/dataframeController.ts b/src/webviews/extension-side/dataframe/dataframeController.ts
index cfbef322ca..3c5093afb8 100644
--- a/src/webviews/extension-side/dataframe/dataframeController.ts
+++ b/src/webviews/extension-side/dataframe/dataframeController.ts
@@ -47,7 +47,7 @@ interface DataFrameObject {
         dtype: string;
         name: string;
     }[];
-    preview_row_count: number;
+    preview_row_count?: number;
     row_count: number;
     rows: Record<string, unknown>[];
     type: string;
diff --git a/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx b/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx
index 4dd85fa068..20dc425ed6 100644
--- a/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx
+++ b/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx
@@ -38,7 +38,7 @@ interface DataframeRendererProps {
             name: string;
             stats: ColumnStats;
         }[];
-        preview_row_count: number;
+        preview_row_count?: number;
         row_count: number;
         rows: {
             _deepnote_index_column: number;
@@ -75,7 +75,7 @@ export const DataframeRenderer = memo(function DataframeRenderer({
     const selectId = useMemo(() => generateUuid(), []);
 
     const filteredColumns = data.columns.filter((column) => !column.name.startsWith('_deepnote_'));
-    const numberOfRows = Math.min(data.row_count, data.preview_row_count);
+    const numberOfRows = Number.isFinite(data.preview_row_count) ? data.preview_row_count : data.row_count;
     const numberOfColumns = filteredColumns.length;
 
     const totalPages = Math.ceil(data.row_count / pageSize);