diff --git a/x/ibc/04-channel/types/codec.go b/x/ibc/04-channel/types/codec.go
index 270852973..3217e9b63 100644
--- a/x/ibc/04-channel/types/codec.go
+++ b/x/ibc/04-channel/types/codec.go
@@ -32,6 +32,8 @@ func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(MsgChannelCloseConfirm{}, "ibc/channel/MsgChannelCloseConfirm", nil)
 
 	cdc.RegisterConcrete(MsgPacket{}, "ibc/channel/MsgPacket", nil)
+	cdc.RegisterConcrete(MsgAcknowledgement{}, "ibc/channel/MsgAcknowledgement", nil)
+	cdc.RegisterConcrete(MsgTimeout{}, "ibc/channel/MsgTimeout", nil)
 
 	SetSubModuleCodec(cdc)
 }
diff --git a/x/ibc/07-tendermint/types/codec.go b/x/ibc/07-tendermint/types/codec.go
index 4221c58ed..086b23aae 100644
--- a/x/ibc/07-tendermint/types/codec.go
+++ b/x/ibc/07-tendermint/types/codec.go
@@ -13,9 +13,9 @@ func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(ConsensusState{}, "ibc/client/tendermint/ConsensusState", nil)
 	cdc.RegisterConcrete(Header{}, "ibc/client/tendermint/Header", nil)
 	cdc.RegisterConcrete(Evidence{}, "ibc/client/tendermint/Evidence", nil)
-	cdc.RegisterConcrete(MsgCreateClient{}, "ibc/client/MsgCreateClient", nil)
-	cdc.RegisterConcrete(MsgUpdateClient{}, "ibc/client/MsgUpdateClient", nil)
-	cdc.RegisterConcrete(MsgSubmitClientMisbehaviour{}, "ibc/client/MsgSubmitClientMisbehaviour", nil)
+	cdc.RegisterConcrete(MsgCreateClient{}, "ibc/client/tendermint/MsgCreateClient", nil)
+	cdc.RegisterConcrete(MsgUpdateClient{}, "ibc/client/tendermint/MsgUpdateClient", nil)
+	cdc.RegisterConcrete(MsgSubmitClientMisbehaviour{}, "ibc/client/tendermint/MsgSubmitClientMisbehaviour", nil)
 
 	SetSubModuleCodec(cdc)
 }
diff --git a/x/ibc/09-localhost/types/codec.go b/x/ibc/09-localhost/types/codec.go
index 3022deb06..67a9431fa 100644
--- a/x/ibc/09-localhost/types/codec.go
+++ b/x/ibc/09-localhost/types/codec.go
@@ -15,6 +15,7 @@ var SubModuleCdc *codec.Codec
 // RegisterCodec registers the localhost types
 func RegisterCodec(cdc *codec.Codec) {
 	cdc.RegisterConcrete(ClientState{}, "ibc/client/localhost/ClientState", nil)
+	cdc.RegisterConcrete(MsgCreateClient{}, "ibc/client/localhost/MsgCreateClient", nil)
 	SetSubModuleCodec(cdc)
 }