diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java b/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
index e576d02fde15..de426b58c0ca 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesRTreeIndex.java
@@ -153,7 +153,7 @@ public int[] findJoinPositions(int position, Page probe, int probeGeometryChanne
             return EMPTY_ADDRESSES;
         }
 
-        int probePartition = probePartitionChannel.map(channel -> INTEGER.getInt(probe.getBlock(channel), probePosition)).orElse(-1);
+        int probePartition = probePartitionChannel.map(channel -> INTEGER.getInt(probe.getBlock(channel), position)).orElse(-1);
 
         Slice slice = probeGeometryBlock.getSlice(probePosition);
         OGCGeometry probeGeometry = deserialize(slice);
diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
index 4fabd1bb7355..c86ddc052027 100644
--- a/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
+++ b/core/trino-main/src/main/java/io/trino/operator/PagesSpatialIndexSupplier.java
@@ -111,14 +111,15 @@ private static STRtree buildRTree(LongArrayList addresses, List<ObjectArrayList<
             int blockIndex = decodeSliceIndex(pageAddress);
             Block chennelBlock = channels.get(geometryChannel).get(blockIndex);
             VariableWidthBlock block = (VariableWidthBlock) chennelBlock.getUnderlyingValueBlock();
-            int blockPosition = chennelBlock.getUnderlyingValuePosition(decodePosition(pageAddress));
+            int blockPosition = decodePosition(pageAddress);
+            int valueBlockPosition = chennelBlock.getUnderlyingValuePosition(blockPosition);
 
             // TODO Consider pushing is-null and is-empty checks into a filter below the join
-            if (block.isNull(blockPosition)) {
+            if (block.isNull(valueBlockPosition)) {
                 continue;
             }
 
-            Slice slice = block.getSlice(blockPosition);
+            Slice slice = block.getSlice(valueBlockPosition);
             OGCGeometry ogcGeometry = deserialize(slice);
             verifyNotNull(ogcGeometry);
             if (ogcGeometry.isEmpty()) {