diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 38a7924124..07a2176e96 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -689,7 +689,13 @@ func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, st
 		return nil, err
 	}
 	codeHash := statedb.GetCodeHash(address)
+	if codeHash == (common.Hash{}) {
+		codeHash = types.EmptyCodeHash
+	}
 	storageRoot := statedb.GetStorageRoot(address)
+	if storageRoot == (common.Hash{}) {
+		storageRoot = types.EmptyRootHash
+	}
 
 	if len(keys) > 0 {
 		var storageTrie state.Trie