diff --git a/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/BlockJson.java b/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/BlockJson.java
index ddfeaff9..fe1d25a7 100644
--- a/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/BlockJson.java
+++ b/src/main/java/io/emeraldpay/dshackle/upstream/ethereum/json/BlockJson.java
@@ -240,7 +240,11 @@ public class BlockJson<T extends TransactionRefJson> implements Serializable {
     }
 
     public HexData getExtraData() {
-        return extraData;
+        if (extraData != null) {
+            return extraData;
+        } else {
+            return HexData.empty();
+        }
     }
 
     public void setExtraData(HexData extraData) {