diff --git a/package-lock.json b/package-lock.json
index 591e5e9..b48c835 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7005,9 +7005,9 @@
       }
     },
     "node_modules/@web3-storage/filecoin-api": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@web3-storage/filecoin-api/-/filecoin-api-7.3.1.tgz",
-      "integrity": "sha512-PBtsovGE4krUyKTBTg8h0Bpg4tjhic6MWkholjaZqzVqVVQcE9dbr2aTCG/6mMURHTr3aiVZTZIl2IvhzFxgzg==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@web3-storage/filecoin-api/-/filecoin-api-7.3.2.tgz",
+      "integrity": "sha512-DIhi6uheibt+JluLdfrCqH0xn/yZEIt+Nupf4OqhX9LBkaT30ySDraHz8yIolyFV7/8hxkSsglH1QQdM7M1F4A==",
       "dependencies": {
         "@ipld/dag-ucan": "^3.4.0",
         "@ucanto/client": "^9.0.1",
@@ -21113,7 +21113,7 @@
         "@ucanto/transport": "^9.1.1",
         "@w3filecoin/core": "*",
         "@web3-storage/data-segment": "^5.3.0",
-        "@web3-storage/filecoin-api": "^7.3.1",
+        "@web3-storage/filecoin-api": "^7.3.2",
         "@web3-storage/filecoin-client": "^3.3.4",
         "lru-cache": "^11.0.1",
         "multiformats": "^13.3.0",
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 98146d2..26dd4f3 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -12,7 +12,7 @@
     "@ucanto/transport": "^9.1.1",
     "@w3filecoin/core": "*",
     "@web3-storage/data-segment": "^5.3.0",
-    "@web3-storage/filecoin-api": "^7.3.1",
+    "@web3-storage/filecoin-api": "^7.3.2",
     "@web3-storage/filecoin-client": "^3.3.4",
     "lru-cache": "^11.0.1",
     "multiformats": "^13.3.0",
diff --git a/packages/functions/src/aggregator/handle-aggregate-insert-to-piece-accept-queue.js b/packages/functions/src/aggregator/handle-aggregate-insert-to-piece-accept-queue.js
index 9fe646a..7f673d2 100644
--- a/packages/functions/src/aggregator/handle-aggregate-insert-to-piece-accept-queue.js
+++ b/packages/functions/src/aggregator/handle-aggregate-insert-to-piece-accept-queue.js
@@ -105,6 +105,9 @@ function getEnv () {
     pieceAcceptQueueUrl: mustGetEnv('PIECE_ACCEPT_QUEUE_URL'),
     pieceAcceptQueueRegion: mustGetEnv('AWS_REGION'),
     maxAggregateSize: Number.parseInt(mustGetEnv('MAX_AGGREGATE_SIZE')),
+    maxAggregatePieces: process.env.MAX_AGGREGATE_PIECES
+      ? Number.parseInt(process.env.MAX_AGGREGATE_PIECES)
+      : undefined,
     minAggregateSize: Number.parseInt(mustGetEnv('MIN_AGGREGATE_SIZE')),
     minUtilizationFactor: Number.parseInt(mustGetEnv('MIN_UTILIZATION_FACTOR')),
   }
diff --git a/packages/functions/src/aggregator/handle-buffer-queue-message.js b/packages/functions/src/aggregator/handle-buffer-queue-message.js
index f2bad6d..cec66b9 100644
--- a/packages/functions/src/aggregator/handle-buffer-queue-message.js
+++ b/packages/functions/src/aggregator/handle-buffer-queue-message.js
@@ -108,7 +108,8 @@ function getContext () {
     aggregateOfferQueueRegion,
     maxAggregateSize,
     minAggregateSize,
-    minUtilizationFactor
+    minUtilizationFactor,
+    maxAggregatePieces
   } = getEnv()
 
   let customHasherUsed = false
@@ -130,6 +131,7 @@ function getContext () {
     ),
     config: {
       maxAggregateSize,
+      maxAggregatePieces,
       minAggregateSize,
       minUtilizationFactor,
       prependBufferedPieces: [{
@@ -169,6 +171,9 @@ function getEnv () {
     aggregateOfferQueueUrl: mustGetEnv('AGGREGATE_OFFER_QUEUE_URL'),
     aggregateOfferQueueRegion: mustGetEnv('AWS_REGION'),
     maxAggregateSize: Number.parseInt(mustGetEnv('MAX_AGGREGATE_SIZE')),
+    maxAggregatePieces: process.env.MAX_AGGREGATE_PIECES
+      ? Number.parseInt(process.env.MAX_AGGREGATE_PIECES)
+      : undefined,
     minAggregateSize: Number.parseInt(mustGetEnv('MIN_AGGREGATE_SIZE')),
     minUtilizationFactor: Number.parseInt(mustGetEnv('MIN_UTILIZATION_FACTOR')),
   }
diff --git a/stacks/aggregator-stack.js b/stacks/aggregator-stack.js
index 568fbd0..a10023a 100644
--- a/stacks/aggregator-stack.js
+++ b/stacks/aggregator-stack.js
@@ -19,6 +19,7 @@ export function AggregatorStack({ stack, app }) {
     AGGREGATOR_HOSTED_ZONE,
     AGGREGATOR_DID,
     MAX_AGGREGATE_SIZE,
+    MAX_AGGREGATE_PIECES,
     MIN_AGGREGATE_SIZE,
     MIN_UTILIZATION_FACTOR,
     AGGREGATOR_PROOF
@@ -184,6 +185,7 @@ export function AggregatorStack({ stack, app }) {
         BUFFER_STORE_BUCKET_NAME: aggregatorBufferStoreBucket.bucketName,
         AGGREGATE_OFFER_QUEUE_URL: aggregateOfferQueue.queueUrl,
         MAX_AGGREGATE_SIZE,
+        MAX_AGGREGATE_PIECES,
         MIN_AGGREGATE_SIZE,
         MIN_UTILIZATION_FACTOR,
       },
@@ -242,6 +244,7 @@ export function AggregatorStack({ stack, app }) {
           BUFFER_STORE_BUCKET_NAME: aggregatorBufferStoreBucket.bucketName,
           PIECE_ACCEPT_QUEUE_URL: pieceAcceptQueue.queueUrl,
           MAX_AGGREGATE_SIZE,
+          MAX_AGGREGATE_PIECES,
           MIN_AGGREGATE_SIZE,
           MIN_UTILIZATION_FACTOR,
         },
diff --git a/stacks/config.js b/stacks/config.js
index 9d6c9a3..4619a35 100644
--- a/stacks/config.js
+++ b/stacks/config.js
@@ -133,6 +133,7 @@ export function getAggregatorEnv(stack) {
     AGGREGATOR_HOSTED_ZONE: process.env.AGGREGATOR_HOSTED_ZONE,
     AGGREGATOR_DID: mustGetEnv('AGGREGATOR_DID'),
     MAX_AGGREGATE_SIZE: process.env.MAX_AGGREGATE_SIZE || defaultMaxAggregateSize,
+    MAX_AGGREGATE_PIECES: process.env.MAX_AGGREGATE_PIECES ?? '',
     MIN_AGGREGATE_SIZE: process.env.MIN_AGGREGATE_SIZE || defaultMinAggregateSize,
     MIN_UTILIZATION_FACTOR: process.env.MIN_UTILIZATION_FACTOR || defaultMinUtilizationFactor,
     AGGREGATOR_PROOF: process.env.AGGREGATOR_PROOF ?? '',