diff --git a/docs/networks/arbitrum-sepolia.md b/docs/networks/arbitrum-sepolia.md
index 37bc1c2c2..14c010454 100644
--- a/docs/networks/arbitrum-sepolia.md
+++ b/docs/networks/arbitrum-sepolia.md
@@ -7,8 +7,8 @@ The Graph Network's testnet is on Arbitrum Sepolia (eip155:421614). Sepolia netw
 | Component          | Release                                                                              |
 | ------------------ | ------------------------------------------------------------------------------------ |
 | contracts          | [5.3.3](https://github.com/graphprotocol/contracts/releases/tag/v5.3.3)              |
-| indexer-agent      | [0.21.5](https://github.com/graphprotocol/indexer/releases/tag/v0.21.5)              |
-| indexer-cli        | [0.21.5](https://github.com/graphprotocol/indexer/releases/tag/v0.21.5)              |
+| indexer-agent      | [0.21.6-2](https://github.com/graphprotocol/indexer/releases/tag/v0.21.6-2)              |
+| indexer-cli        | [0.21.6-2](https://github.com/graphprotocol/indexer/releases/tag/v0.21.6-2)              |
 | indexer-service-rs | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | tap-agent          | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | graph-node         | [0.35.1](https://github.com/graphprotocol/graph-node/releases/tag/v0.35.1)           |
diff --git a/lerna.json b/lerna.json
index 2c19e7d9d..bff2576e3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.21.5"
+  "version": "0.21.6-2"
 }
diff --git a/packages/indexer-agent/package.json b/packages/indexer-agent/package.json
index 499ac5cc4..5d1216d34 100644
--- a/packages/indexer-agent/package.json
+++ b/packages/indexer-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-agent",
-  "version": "0.21.5",
+  "version": "0.21.6-2",
   "description": "Indexer agent",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "2.0.10",
-    "@graphprotocol/indexer-common": "^0.21.4",
+    "@graphprotocol/indexer-common": "^0.21.6-2",
     "@thi.ng/heaps": "^1.3.1",
     "@uniswap/sdk": "3.0.3",
     "axios": "0.26.1",
diff --git a/packages/indexer-cli/package.json b/packages/indexer-cli/package.json
index a116bb020..d0ab4e7f2 100644
--- a/packages/indexer-cli/package.json
+++ b/packages/indexer-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-cli",
-  "version": "0.21.5",
+  "version": "0.21.6-2",
   "description": "Indexer CLI for The Graph Network",
   "main": "./dist/cli.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "2.0.10",
-    "@graphprotocol/indexer-common": "^0.21.5",
+    "@graphprotocol/indexer-common": "^0.21.6-2",
     "@iarna/toml": "2.2.5",
     "@thi.ng/iterators": "5.1.74",
     "@urql/core": "3.1.0",
diff --git a/packages/indexer-common/package.json b/packages/indexer-common/package.json
index dbf0052e4..3cf75f218 100644
--- a/packages/indexer-common/package.json
+++ b/packages/indexer-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-common",
-  "version": "0.21.5",
+  "version": "0.21.6-2",
   "description": "Common library for Graph Protocol indexer components",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/indexer-common/src/graph-node.ts b/packages/indexer-common/src/graph-node.ts
index ca0995b12..9e47d6616 100644
--- a/packages/indexer-common/src/graph-node.ts
+++ b/packages/indexer-common/src/graph-node.ts
@@ -153,14 +153,16 @@ export class GraphNode {
   ): Promise<SubgraphDeploymentAssignment[]> {
     try {
       this.logger.debug('Fetch subgraph deployment assignments')
-      const result = await this.status
+
+      // FIXME: remove this initial check for just node when graph-node releases
+      // https://github.com/graphprotocol/graph-node/pull/5551
+      const nodeOnlyResult = await this.status
         .query(
           gql`
             {
               indexingStatuses {
                 subgraphDeployment: subgraph
                 node
-                paused
               }
             }
           `,
@@ -168,6 +170,33 @@ export class GraphNode {
         )
         .toPromise()
 
+      if (nodeOnlyResult.error) {
+        throw nodeOnlyResult.error
+      }
+
+      const withAssignments: string[] = nodeOnlyResult.data.indexingStatuses
+        .filter((result: QueryResult) => {
+          return result.node !== null && result.node !== undefined
+        })
+        .map((result: QueryResult) => {
+          return result.subgraphDeployment
+        })
+
+      const result = await this.status
+        .query(
+          gql`
+            query indexingStatuses($subgraphs: [String!]!) {
+              indexingStatuses(subgraphs: $subgraphs) {
+                subgraphDeployment: subgraph
+                node
+                paused
+              }
+            }
+          `,
+          { subgraphs: withAssignments },
+        )
+        .toPromise()
+
       if (result.error) {
         throw result.error
       }
diff --git a/packages/indexer-native/package.json b/packages/indexer-native/package.json
index c9aadcc14..9e3210a39 100644
--- a/packages/indexer-native/package.json
+++ b/packages/indexer-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-native",
-  "version": "0.21.5",
+  "version": "0.21.6",
   "description": "Performance sensitive indexer code",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/packages/indexer-service/package.json b/packages/indexer-service/package.json
index 0c4b7f026..8a7bb879a 100644
--- a/packages/indexer-service/package.json
+++ b/packages/indexer-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-service",
-  "version": "0.21.5",
+  "version": "0.21.6-2",
   "description": "Indexer service",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -33,8 +33,8 @@
   "dependencies": {
     "@google-cloud/profiler": "6.0.1",
     "@graphprotocol/common-ts": "2.0.10",
-    "@graphprotocol/indexer-common": "^0.21.5",
-    "@graphprotocol/indexer-native": "0.21.5",
+    "@graphprotocol/indexer-common": "^0.21.6-2",
+    "@graphprotocol/indexer-native": "0.21.6",
     "@graphql-tools/load": "8.0.0",
     "@graphql-tools/url-loader": "8.0.0",
     "@graphql-tools/wrap": "10.0.1",