diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 84c919e5d..3f2a7b49e 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -610,7 +610,9 @@ class Blocks {
     const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
     const blockExtended = await this.$getBlockExtended(block, transactions);
 
-    await blocksRepository.$saveBlockInDatabase(blockExtended);
+    if (Common.indexingEnabled()) {
+      await blocksRepository.$saveBlockInDatabase(blockExtended);
+    }
 
     return prepareBlock(blockExtended);
   }
@@ -714,7 +716,7 @@ class Blocks {
         block = await this.$indexBlock(currentHeight);
         returnBlocks.push(block);
       } else if (nextHash != null) {
-        block = prepareBlock(await bitcoinClient.getBlock(nextHash));
+        block = await this.$indexBlock(currentHeight);
         nextHash = block.previousblockhash;
         returnBlocks.push(block);
       }
diff --git a/backend/src/utils/blocks-utils.ts b/backend/src/utils/blocks-utils.ts
index b933d6ae7..43a2fc964 100644
--- a/backend/src/utils/blocks-utils.ts
+++ b/backend/src/utils/blocks-utils.ts
@@ -17,7 +17,7 @@ export function prepareBlock(block: any): BlockExtended {
     extras: {
       coinbaseRaw: block.coinbase_raw ?? block.extras?.coinbaseRaw,
       medianFee: block.medianFee ?? block.median_fee ?? block.extras?.medianFee,
-      feeRange: block.feeRange ?? block.fee_span,
+      feeRange: block.feeRange ?? block?.extras?.feeRange ?? block.fee_span,
       reward: block.reward ?? block?.extras?.reward,
       totalFees: block.totalFees ?? block?.fees ?? block?.extras?.totalFees,
       avgFee: block?.extras?.avgFee ?? block.avg_fee,