diff --git a/packages/indexer-cli/src/actions.ts b/packages/indexer-cli/src/actions.ts
index 444fe1f0a..f7ccab61c 100644
--- a/packages/indexer-cli/src/actions.ts
+++ b/packages/indexer-cli/src/actions.ts
@@ -256,8 +256,7 @@ export async function executeApprovedActions(
           }
         }
       `,
-      [],
-      [],
+      undefined,
     )
     .toPromise()
 
diff --git a/packages/indexer-cli/src/cost.ts b/packages/indexer-cli/src/cost.ts
index 66fb758e0..ca891d88e 100644
--- a/packages/indexer-cli/src/cost.ts
+++ b/packages/indexer-cli/src/cost.ts
@@ -203,8 +203,7 @@ export const costModels = async (
           }
         }
       `,
-      [],
-      [],
+      undefined,
     )
     .toPromise()
 
diff --git a/packages/indexer-common/src/graph-node.ts b/packages/indexer-common/src/graph-node.ts
index 108ba2f57..ca0995b12 100644
--- a/packages/indexer-common/src/graph-node.ts
+++ b/packages/indexer-common/src/graph-node.ts
@@ -156,7 +156,7 @@ export class GraphNode {
       const result = await this.status
         .query(
           gql`
-            query indexingStatuses {
+            {
               indexingStatuses {
                 subgraphDeployment: subgraph
                 node
@@ -164,8 +164,7 @@ export class GraphNode {
               }
             }
           `,
-          [],
-          [],
+          undefined,
         )
         .toPromise()
 
@@ -226,8 +225,7 @@ export class GraphNode {
               }
             }
           `,
-          [],
-          [],
+          undefined,
         )
         .toPromise()
 
diff --git a/packages/indexer-common/src/indexer-management/__tests__/resolvers/cost-models.test.ts b/packages/indexer-common/src/indexer-management/__tests__/resolvers/cost-models.test.ts
index 29acf6248..98c510a06 100644
--- a/packages/indexer-common/src/indexer-management/__tests__/resolvers/cost-models.test.ts
+++ b/packages/indexer-common/src/indexer-management/__tests__/resolvers/cost-models.test.ts
@@ -396,7 +396,7 @@ describe('Cost models', () => {
     }
 
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', inputs)
   })
 
@@ -478,7 +478,7 @@ describe('Cost models', () => {
     await client.mutation(SET_COST_MODEL_MUTATION, { costModel: input }).toPromise()
 
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [expected])
   })
 
@@ -596,7 +596,7 @@ describe('Feature: Inject $DAI variable', () => {
     await client.mutation(SET_COST_MODEL_MUTATION, { costModel: update }).toPromise()
 
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [initial])
   })
 
@@ -614,7 +614,7 @@ describe('Feature: Inject $DAI variable', () => {
     }
     await client.mutation(SET_COST_MODEL_MUTATION, { costModel: update }).toPromise()
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [update])
   })
 
@@ -639,7 +639,7 @@ describe('Feature: Inject $DAI variable', () => {
     await client.setDai('15.3')
 
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [
       {
         ...inputs[0],
@@ -677,7 +677,7 @@ describe('Feature: Inject $DAI variable', () => {
     }
 
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [
       {
         ...inputs[0],
@@ -707,7 +707,7 @@ describe('Feature: Inject $DAI variable', () => {
     }
     await client.mutation(SET_COST_MODEL_MUTATION, { costModel: update }).toPromise()
     await expect(
-      client.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      client.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [
       {
         ...update,
@@ -742,7 +742,7 @@ describe('Feature: Inject $DAI variable', () => {
       .mutation(SET_COST_MODEL_MUTATION, { costModel: update })
       .toPromise()
     await expect(
-      clientNoInjectDai.query(GET_COST_MODELS_QUERY, [], []).toPromise(),
+      clientNoInjectDai.query(GET_COST_MODELS_QUERY, undefined).toPromise(),
     ).resolves.toHaveProperty('data.costModels', [update])
   })
 })