diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go
index 4a308e29f2..cbe5d94bd3 100644
--- a/x/evm/keeper/keeper.go
+++ b/x/evm/keeper/keeper.go
@@ -307,7 +307,6 @@ func (k Keeper) GetAccountStorage(ctx sdk.Context, address common.Address) (type
 
 func (k Keeper) DeleteState(addr common.Address, key common.Hash) {
 	store := prefix.NewStore(k.Ctx().KVStore(k.storeKey), types.AddressStoragePrefix(addr))
-	key = types.KeyAddressStorage(addr, key)
 	store.Delete(key.Bytes())
 }
 
diff --git a/x/evm/keeper/statedb.go b/x/evm/keeper/statedb.go
index 7b3ad72461..76a42116ce 100644
--- a/x/evm/keeper/statedb.go
+++ b/x/evm/keeper/statedb.go
@@ -454,10 +454,9 @@ func (k *Keeper) GetRefund() uint64 {
 // State
 // ----------------------------------------------------------------------------
 
-func doGetState(ctx sdk.Context, storeKey sdk.StoreKey, addr common.Address, hash common.Hash) common.Hash {
+func doGetState(ctx sdk.Context, storeKey sdk.StoreKey, addr common.Address, key common.Hash) common.Hash {
 	store := prefix.NewStore(ctx.KVStore(storeKey), types.AddressStoragePrefix(addr))
 
-	key := types.KeyAddressStorage(addr, hash)
 	value := store.Get(key.Bytes())
 	if len(value) == 0 {
 		return common.Hash{}
@@ -496,7 +495,6 @@ func (k *Keeper) SetState(addr common.Address, key, value common.Hash) {
 
 	ctx := k.Ctx()
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.AddressStoragePrefix(addr))
-	key = types.KeyAddressStorage(addr, key)
 
 	action := "updated"
 	if ethermint.IsEmptyHash(value.Hex()) {
diff --git a/x/evm/types/key.go b/x/evm/types/key.go
index 16a2b3928d..1b89c26080 100644
--- a/x/evm/types/key.go
+++ b/x/evm/types/key.go
@@ -2,7 +2,6 @@ package types
 
 import (
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 )
 
 const (
@@ -69,17 +68,3 @@ func AddressStoragePrefix(address common.Address) []byte {
 func StateKey(address common.Address, key []byte) []byte {
 	return append(AddressStoragePrefix(address), key...)
 }
-
-// KeyAddressStorage returns the key hash to access a given account state. The composite key
-// (address + hash) is hashed using Keccak256.
-func KeyAddressStorage(address common.Address, hash common.Hash) common.Hash {
-	prefix := address.Bytes()
-	key := hash.Bytes()
-
-	compositeKey := make([]byte, len(prefix)+len(key))
-
-	copy(compositeKey, prefix)
-	copy(compositeKey[len(prefix):], key)
-
-	return crypto.Keccak256Hash(compositeKey)
-}