diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/LocalCallRouter.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/LocalCallRouter.kt
index 7bded460..c5117a1f 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/LocalCallRouter.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/LocalCallRouter.kt
@@ -152,10 +152,7 @@ class LocalCallRouter(
                 blockRef == "earliest" -> {
                     number = 0
                 }
-                blockRef == "finalized" -> {
-                    return null
-                }
-                blockRef == "pending" -> {
+                blockRef == "finalized" || blockRef == "safe" || blockRef == "pending" -> {
                     return null
                 }
                 else -> {