diff --git a/packages/payment-detection/src/thegraph/conversion-info-retriever.ts b/packages/payment-detection/src/thegraph/conversion-info-retriever.ts
index 6cdfce726b..cede1c6335 100644
--- a/packages/payment-detection/src/thegraph/conversion-info-retriever.ts
+++ b/packages/payment-detection/src/thegraph/conversion-info-retriever.ts
@@ -22,9 +22,7 @@ export class TheGraphConversionInfoRetriever extends TheGraphInfoRetriever<Conve
   ): Promise<PaymentTypes.AllNetworkEvents<PaymentTypes.IERC20FeePaymentEventParameters>> {
     const { payments } = params.acceptedTokens
       ? await this.client.GetAnyToFungiblePayments({
-          blockFilter: this.client.options?.minIndexedBlock
-            ? { number_gte: this.client.options.minIndexedBlock }
-            : undefined,
+          blockFilter: { number_gte: this.client.options?.minIndexedBlock || 0 },
           reference: utils.keccak256(`0x${params.paymentReference}`),
           to: params.toAddress.toLowerCase(),
           currency: params.requestCurrency.hash.toLowerCase(),
@@ -32,9 +30,7 @@ export class TheGraphConversionInfoRetriever extends TheGraphInfoRetriever<Conve
           contractAddress: params.contractAddress.toLowerCase(),
         })
       : await this.client.GetAnyToNativePayments({
-          blockFilter: this.client.options?.minIndexedBlock
-            ? { number_gte: this.client.options.minIndexedBlock }
-            : undefined,
+          blockFilter: { number_gte: this.client.options?.minIndexedBlock || 0 },
           reference: utils.keccak256(`0x${params.paymentReference}`),
           to: params.toAddress.toLowerCase(),
           currency: params.requestCurrency.hash.toLowerCase(),
diff --git a/packages/payment-detection/src/thegraph/info-retriever.ts b/packages/payment-detection/src/thegraph/info-retriever.ts
index 8b228d9009..671eed50d5 100644
--- a/packages/payment-detection/src/thegraph/info-retriever.ts
+++ b/packages/payment-detection/src/thegraph/info-retriever.ts
@@ -25,9 +25,7 @@ export class TheGraphInfoRetriever<TGraphQuery extends TransferEventsParams = Tr
       throw new Error('TheGraphInfoRetriever only supports no or 1 acceptedToken.');
     }
     const { payments, escrowEvents } = await this.client.GetPaymentsAndEscrowState({
-      blockFilter: this.client.options?.minIndexedBlock
-        ? { number_gte: this.client.options.minIndexedBlock }
-        : undefined,
+      blockFilter: { number_gte: this.client.options?.minIndexedBlock || 0 },
       reference: utils.keccak256(`0x${params.paymentReference}`),
       to: params.toAddress.toLowerCase(),
       tokenAddress: params.acceptedTokens ? params.acceptedTokens[0].toLowerCase() : null,
@@ -48,9 +46,7 @@ export class TheGraphInfoRetriever<TGraphQuery extends TransferEventsParams = Tr
       throw new Error('TheGraphInfoRetriever only supports no or 1 acceptedToken.');
     }
     const { payments, escrowEvents } = await this.client.GetPaymentsAndEscrowStateForReceivables({
-      blockFilter: this.client.options?.minIndexedBlock
-        ? { number_gte: this.client.options.minIndexedBlock }
-        : undefined,
+      blockFilter: { number_gte: this.client.options?.minIndexedBlock || 0 },
       reference: utils.keccak256(`0x${params.paymentReference}`),
       tokenAddress: params.acceptedTokens ? params.acceptedTokens[0].toLowerCase() : null,
       contractAddress: params.contractAddress.toLowerCase(),
diff --git a/packages/payment-detection/src/thegraph/queries/GetPaymentsAndEscrowState.graphql b/packages/payment-detection/src/thegraph/queries/GetPaymentsAndEscrowState.graphql
index 8667bcc104..bacab92489 100644
--- a/packages/payment-detection/src/thegraph/queries/GetPaymentsAndEscrowState.graphql
+++ b/packages/payment-detection/src/thegraph/queries/GetPaymentsAndEscrowState.graphql
@@ -28,7 +28,7 @@ fragment EscrowEventResult on EscrowEvent {
 }
 
 query GetPaymentsAndEscrowState(
-  $blockFilter: Block_height
+  $blockFilter: Block_height!
   $reference: Bytes!
   $to: Bytes!
   $tokenAddress: Bytes
@@ -60,7 +60,7 @@ query GetPaymentsAndEscrowState(
 
 # AnyToErc20 payments: denominated in request $currency payable with many token addresses
 query GetAnyToFungiblePayments(
-  $blockFilter: Block_height
+  $blockFilter: Block_height!
   $reference: Bytes!
   $to: Bytes!
   $currency: Bytes!
@@ -85,7 +85,7 @@ query GetAnyToFungiblePayments(
 
 # AnyToETH payments: denominated in request $currency payable with the EVM native token
 query GetAnyToNativePayments(
-  $blockFilter: Block_height
+  $blockFilter: Block_height!
   $reference: Bytes!
   $to: Bytes!
   $currency: Bytes!
@@ -109,7 +109,7 @@ query GetAnyToNativePayments(
 
 # Receivables can be transferred to different owners, so searching by to could drop balance events.
 query GetPaymentsAndEscrowStateForReceivables(
-  $blockFilter: Block_height
+  $blockFilter: Block_height!
   $reference: Bytes!
   $tokenAddress: Bytes!
   $contractAddress: Bytes!