diff --git a/modules/module-postgres-storage/src/storage/PostgresCompactor.ts b/modules/module-postgres-storage/src/storage/PostgresCompactor.ts
index b19d866e..2a06a347 100644
--- a/modules/module-postgres-storage/src/storage/PostgresCompactor.ts
+++ b/modules/module-postgres-storage/src/storage/PostgresCompactor.ts
@@ -110,33 +110,63 @@ export class PostgresCompactor {
     let upperOpIdLimit = BIGINT_MAX;
 
     while (true) {
-      const batch = await this.db.sql`
-        SELECT
-          op,
-          op_id,
-          source_table,
-          table_name,
-          row_id,
-          source_key,
-          bucket_name
-        FROM
-          bucket_data
-        WHERE
-          group_id = ${{ type: 'int4', value: this.group_id }}
-          AND bucket_name >= ${{ type: 'varchar', value: bucketLower }}
-          AND (
-            (
-              bucket_name = ${{ type: 'varchar', value: bucketUpper }}
-              AND op_id < ${{ type: 'int8', value: upperOpIdLimit }}
-            )
-            OR bucket_name < ${{ type: 'varchar', value: bucketUpper }} COLLATE "C" -- Use binary comparison
-          )
-        ORDER BY
-          bucket_name DESC,
-          op_id DESC
-        LIMIT
-          ${{ type: 'int4', value: this.moveBatchQueryLimit }}
-      `
+      const bucketLowerValue = bucketLower ?? '';
+      const bucketUpperValue = bucketUpper ?? MAX_CHAR;
+      const bucketLowerParam = { type: 'varchar' as const, value: bucketLowerValue };
+      const bucketUpperParam = { type: 'varchar' as const, value: bucketUpperValue };
+      const limitParam = { type: 'int4' as const, value: this.moveBatchQueryLimit };
+      const groupParam = { type: 'int4' as const, value: this.group_id };
+      const upperOpParam = { type: 'int8' as const, value: upperOpIdLimit };
+
+      const batchStatement =
+        upperOpIdLimit === BIGINT_MAX
+          ? this.db.sql`
+              SELECT
+                op,
+                op_id,
+                source_table,
+                table_name,
+                row_id,
+                source_key,
+                bucket_name
+              FROM
+                bucket_data
+              WHERE
+                group_id = ${groupParam}
+                AND bucket_name >= ${bucketLowerParam}
+                AND bucket_name < ${bucketUpperParam} COLLATE "C" -- Use binary comparison
+              ORDER BY
+                bucket_name DESC,
+                op_id DESC
+              LIMIT
+                ${limitParam}
+            `
+          : this.db.sql`
+              SELECT
+                op,
+                op_id,
+                source_table,
+                table_name,
+                row_id,
+                source_key,
+                bucket_name
+              FROM
+                bucket_data
+              WHERE
+                group_id = ${groupParam}
+                AND bucket_name >= ${bucketLowerParam}
+                AND ROW (bucket_name COLLATE "C", op_id) < ROW (
+                  ${bucketUpperParam},
+                  ${upperOpParam}
+                )
+              ORDER BY
+                bucket_name DESC,
+                op_id DESC
+              LIMIT
+                ${limitParam}
+            `;
+
+      const batch = await batchStatement
         .decoded(
           pick(models.BucketData, ['op', 'source_table', 'table_name', 'source_key', 'row_id', 'op_id', 'bucket_name'])
         )