diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java b/src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java
index 51d337ea8ea8..adfb53a9c867 100644
--- a/src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java
+++ b/src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java
@@ -179,13 +179,7 @@ public long exactRowIdOrInvertedCeiling(PrimaryKey key)
     @Override
     public long ceiling(PrimaryKey key)
     {
-        var rowId = exactRowIdOrInvertedCeiling(key);
-        if (rowId >= 0)
-            return rowId;
-        if (rowId == Long.MIN_VALUE)
-            return -1;
-        else
-            return -rowId - 1;
+        return rowIdToToken.ceilingRowId(key.token().getLongValue());
     }
 
     @Override