diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
index 424f4c17902e..09ee439aadf6 100644
--- a/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
+++ b/lib/trino-parquet/src/main/java/io/trino/parquet/reader/ParquetReader.java
@@ -87,7 +87,7 @@ public class ParquetReader
 
     private final Optional<String> fileCreatedBy;
     private final List<BlockMetaData> blocks;
-    private final Optional<List<Long>> firstRowsOfBlocks;
+    private final List<Long> firstRowsOfBlocks;
     private final List<PrimitiveColumnIO> columns;
     private final ParquetDataSource dataSource;
     private final DateTimeZone timeZone;
@@ -100,7 +100,7 @@ public class ParquetReader
     /**
      * Index in the Parquet file of the first row of the current group
      */
-    private Optional<Long> firstRowIndexInGroup = Optional.empty();
+    private long firstRowIndexInGroup;
     /**
      * Index in the current group of the next row
      */
@@ -124,7 +124,7 @@ public ParquetReader(
             Optional<String> fileCreatedBy,
             MessageColumnIO messageColumnIO,
             List<BlockMetaData> blocks,
-            Optional<List<Long>> firstRowsOfBlocks,
+            List<Long> firstRowsOfBlocks,
             ParquetDataSource dataSource,
             DateTimeZone timeZone,
             AggregatedMemoryContext memoryContext,
@@ -138,7 +138,7 @@ public ParquetReader(
             Optional<String> fileCreatedBy,
             MessageColumnIO messageColumnIO,
             List<BlockMetaData> blocks,
-            Optional<List<Long>> firstRowsOfBlocks,
+            List<Long> firstRowsOfBlocks,
             ParquetDataSource dataSource,
             DateTimeZone timeZone,
             AggregatedMemoryContext memoryContext,
@@ -159,9 +159,7 @@ public ParquetReader(
         this.columnReaders = new PrimitiveColumnReader[columns.size()];
         this.maxBytesPerCell = new long[columns.size()];
 
-        firstRowsOfBlocks.ifPresent(firstRows -> {
-            checkArgument(blocks.size() == firstRows.size(), "elements of firstRowsOfBlocks must correspond to blocks");
-        });
+        checkArgument(blocks.size() == firstRowsOfBlocks.size(), "elements of firstRowsOfBlocks must correspond to blocks");
 
         this.columnIndexStore = columnIndexStore;
         this.blockRowRanges = listWithNulls(this.blocks.size());
@@ -217,8 +215,7 @@ public void close()
      */
     public long lastBatchStartRow()
     {
-        long baseIndex = firstRowIndexInGroup.orElseThrow(() -> new IllegalStateException("row index unavailable"));
-        return baseIndex + nextRowInGroup - batchSize;
+        return firstRowIndexInGroup + nextRowInGroup - batchSize;
     }
 
     public int nextBatch()
@@ -247,7 +244,7 @@ private boolean advanceToNextRowGroup()
             return false;
         }
         currentBlockMetadata = blocks.get(currentRowGroup);
-        firstRowIndexInGroup = firstRowsOfBlocks.map(firstRows -> firstRows.get(currentRowGroup));
+        firstRowIndexInGroup = firstRowsOfBlocks.get(currentRowGroup);
         currentGroupRowCount = currentBlockMetadata.getRowCount();
         if (filter.isPresent() && options.isUseColumnIndex()) {
             if (columnIndexStore.get(currentRowGroup).isPresent()) {
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
index 1aeee10e3e85..0e2f44e1e331 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/parquet/ParquetPageSourceFactory.java
@@ -255,7 +255,7 @@ && predicateMatches(parquetPredicate, block, dataSource, descriptorsByPath, parq
                     Optional.ofNullable(fileMetaData.getCreatedBy()),
                     messageColumn,
                     blocks.build(),
-                    Optional.of(blockStarts.build()),
+                    blockStarts.build(),
                     dataSource,
                     timeZone,
                     newSimpleAggregatedMemoryContext(),
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
index 8de9212b06a9..245dec0f67f1 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergPageSourceProvider.java
@@ -724,7 +724,7 @@ private static ReaderPageSource createParquetPageSource(
                     Optional.ofNullable(fileMetaData.getCreatedBy()),
                     messageColumnIO,
                     blocks,
-                    Optional.of(blockStarts.build()),
+                    blockStarts.build(),
                     dataSource,
                     UTC,
                     memoryContext,