diff --git a/waku/api.go b/waku/api.go
index da3fda34c..5ec6f9ef0 100644
--- a/waku/api.go
+++ b/waku/api.go
@@ -209,8 +209,6 @@ func (api *PublicWakuAPI) CancelLightClient(ctx context.Context) bool {
 	return !api.w.LightClientMode()
 }
 
-//go:generate gencodec -type NewMessage -field-override newMessageOverride -out gen_newmessage_json.go
-
 // NewMessage represents a new waku message that is posted through the RPC.
 type NewMessage struct {
 	SymKeyID   string           `json:"symKeyID"`
@@ -428,8 +426,6 @@ func (api *PublicWakuAPI) Messages(ctx context.Context, crit Criteria) (*rpc.Sub
 	return rpcSub, nil
 }
 
-//go:generate gencodec -type Message -field-override messageOverride -out gen_message_json.go
-
 // Message is the RPC representation of a waku message.
 type Message struct {
 	Sig       []byte           `json:"sig,omitempty"`
diff --git a/wakuv2/api.go b/wakuv2/api.go
index 1d34c9528..49be14a32 100644
--- a/wakuv2/api.go
+++ b/wakuv2/api.go
@@ -171,8 +171,6 @@ func (api *PublicWakuAPI) BloomFilter() []byte {
 	return nil
 }
 
-//go:generate gencodec -type NewMessage -field-override newMessageOverride -out gen_newmessage_json.go
-
 // NewMessage represents a new waku message that is posted through the RPC.
 type NewMessage struct {
 	SymKeyID     string           `json:"symKeyID"`
@@ -376,8 +374,6 @@ func (api *PublicWakuAPI) Messages(ctx context.Context, crit Criteria) (*rpc.Sub
 	return rpcSub, nil
 }
 
-//go:generate gencodec -type Message -field-override messageOverride -out gen_message_json.go
-
 // Message is the RPC representation of a waku message.
 type Message struct {
 	Sig          []byte           `json:"sig,omitempty"`