diff --git a/app/ethermint.go b/app/ethermint.go
index 717f70a1..1e22ea19 100644
--- a/app/ethermint.go
+++ b/app/ethermint.go
@@ -2,9 +2,10 @@ package app
 
 import (
 	"encoding/json"
-	"github.com/cosmos/ethermint/x/evm"
 	"os"
 
+	"github.com/cosmos/ethermint/x/evm"
+
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -25,7 +26,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cosmos/cosmos-sdk/x/supply"
 
-	"github.com/cosmos/ethermint/crypto"
 	evmtypes "github.com/cosmos/ethermint/x/evm/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -67,9 +67,6 @@ var (
 func MakeCodec() *codec.Codec {
 	var cdc = codec.New()
 
-	// TODO: Move this codec to module (Issue #12 https://github.com/ChainSafe/ethermint/issues/12)
-	crypto.RegisterCodec(cdc)
-
 	ModuleBasics.RegisterCodec(cdc)
 	sdk.RegisterCodec(cdc)
 	codec.RegisterCrypto(cdc)
diff --git a/x/evm/types/codec.go b/x/evm/types/codec.go
index 985e4def..5c081817 100644
--- a/x/evm/types/codec.go
+++ b/x/evm/types/codec.go
@@ -1,6 +1,9 @@
 package types
 
-import "github.com/cosmos/cosmos-sdk/codec"
+import (
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/ethermint/crypto"
+)
 
 var ModuleCdc = codec.New()
 
@@ -16,4 +19,5 @@ func init() {
 // RegisterCodec registers concrete types and interfaces on the given codec.
 func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(&EthereumTxMsg{}, "ethermint/MsgEthereumTx", nil)
+	crypto.RegisterCodec(cdc)
 }