diff --git a/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/JsonPayloadTransformation.scala b/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/JsonPayloadTransformation.scala
index a37092f..eee1c65 100644
--- a/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/JsonPayloadTransformation.scala
+++ b/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/JsonPayloadTransformation.scala
@@ -13,7 +13,9 @@ private[jsonrpclib] object JsonPayloadTransformation extends (Schema ~> Schema)
         struct.fields
           .collectFirst {
             case field if field.hints.has[JsonRpcPayload] =>
-              field.schema.biject[b]((f: Any) => struct.make(Vector(f)))(field.get)
+              field.schema
+                .transformHintsLocally(_.filterNot(_.keyId == JsonRpcPayload.id))
+                .biject[b]((f: Any) => struct.make(Vector(f)))(field.get)
           }
           .getOrElse(fa)
       case _ => fa
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1a67d0e..45d3909 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -14,6 +14,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
-addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.37")
+addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.38")
 
 addDependencyTreePlugin