diff --git a/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt b/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt
index f49e34261..a5aca45d8 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt
@@ -48,7 +48,7 @@ class BlockContainer(
                 block.number,
                 BlockId.from(block),
                 block.parentHash?.let(BlockId.Companion::from),
-                block.totalDifficulty,
+                block.totalDifficulty ?: BigInteger.ZERO,
                 block.timestamp,
                 hasTransactions,
                 raw,
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt
index 50da9525b..116c05e5b 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt
@@ -187,7 +187,7 @@ class TrackEthereumTx(
     }
 
     fun setBlockDetails(tx: TxDetails, block: BlockJson<TransactionRefJson>): TxDetails {
-        return if (block.number != null && block.totalDifficulty != null) {
+        return if (block.number != null) {
             tx.withStatus(
                 blockTotalDifficulty = block.totalDifficulty,
                 blockTime = block.timestamp