diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
index 4eea49fd3..e919375d9 100644
--- a/baseapp/baseapp_test.go
+++ b/baseapp/baseapp_test.go
@@ -769,6 +769,7 @@ func MakeCodec() *wire.Codec {
 	crypto.RegisterAmino(cdc)
 	cdc.RegisterInterface((*auth.Account)(nil), nil)
 	cdc.RegisterConcrete(&auth.BaseAccount{}, "cosmos-sdk/BaseAccount", nil)
+	cdc.Seal()
 	return cdc
 }
 
diff --git a/cmd/gaia/cmd/gaiadebug/hack.go b/cmd/gaia/cmd/gaiadebug/hack.go
index 1f2ef0649..ddc8466c7 100644
--- a/cmd/gaia/cmd/gaiadebug/hack.go
+++ b/cmd/gaia/cmd/gaiadebug/hack.go
@@ -197,6 +197,7 @@ func MakeCodec() *wire.Codec {
 	auth.RegisterWire(cdc)
 	sdk.RegisterWire(cdc)
 	wire.RegisterCrypto(cdc)
+	cdc.Seal()
 	return cdc
 }
 
diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
index f75d6a834..6df74ef28 100644
--- a/examples/basecoin/app/app.go
+++ b/examples/basecoin/app/app.go
@@ -103,6 +103,8 @@ func MakeCodec() *wire.Codec {
 	cdc.RegisterInterface((*auth.Account)(nil), nil)
 	cdc.RegisterConcrete(&types.AppAccount{}, "basecoin/Account", nil)
 
+	cdc.Seal()
+
 	return cdc
 }
 
diff --git a/examples/democoin/app/app.go b/examples/democoin/app/app.go
index 1c44a0bbd..6ea7d5247 100644
--- a/examples/democoin/app/app.go
+++ b/examples/democoin/app/app.go
@@ -113,6 +113,9 @@ func MakeCodec() *wire.Codec {
 	// Register AppAccount
 	cdc.RegisterInterface((*auth.Account)(nil), nil)
 	cdc.RegisterConcrete(&types.AppAccount{}, "democoin/Account", nil)
+
+	cdc.Seal()
+
 	return cdc
 }
 
diff --git a/examples/democoin/x/oracle/oracle_test.go b/examples/democoin/x/oracle/oracle_test.go
index ef925c94f..467035897 100644
--- a/examples/democoin/x/oracle/oracle_test.go
+++ b/examples/democoin/x/oracle/oracle_test.go
@@ -48,6 +48,8 @@ func makeCodec() *wire.Codec {
 	cdc.RegisterInterface((*Payload)(nil), nil)
 	cdc.RegisterConcrete(seqOracle{}, "test/oracle/seqOracle", nil)
 
+	cdc.Seal()
+
 	return cdc
 }
 
diff --git a/wire/wire.go b/wire/wire.go
index 1d5291f86..679bf7c28 100644
--- a/wire/wire.go
+++ b/wire/wire.go
@@ -44,6 +44,5 @@ var Cdc *Codec
 func init() {
 	cdc := NewCodec()
 	RegisterCrypto(cdc)
-	Cdc = cdc
-	//Cdc = cdc.Seal() // TODO uncomment once amino upgraded to 0.9.10
+	Cdc = cdc.Seal()
 }
diff --git a/x/ibc/ibc_test.go b/x/ibc/ibc_test.go
index 4cb708c1b..1d87e7806 100644
--- a/x/ibc/ibc_test.go
+++ b/x/ibc/ibc_test.go
@@ -53,6 +53,8 @@ func makeCodec() *wire.Codec {
 	cdc.RegisterConcrete(&auth.BaseAccount{}, "test/ibc/Account", nil)
 	wire.RegisterCrypto(cdc)
 
+	cdc.Seal()
+
 	return cdc
 }