diff --git a/docs/asyncapi-docs/src/main/scala/sttp/tapir/docs/asyncapi/MessagesForEndpoints.scala b/docs/asyncapi-docs/src/main/scala/sttp/tapir/docs/asyncapi/MessagesForEndpoints.scala
index c4ea96f1eb..cc1efd2718 100644
--- a/docs/asyncapi-docs/src/main/scala/sttp/tapir/docs/asyncapi/MessagesForEndpoints.scala
+++ b/docs/asyncapi-docs/src/main/scala/sttp/tapir/docs/asyncapi/MessagesForEndpoints.scala
@@ -53,7 +53,7 @@ private[asyncapi] class MessagesForEndpoints(tschemaToASchema: TSchemaToASchema,
       Nil,
       None,
       Nil,
-      if (convertedExamples.isEmpty) Nil else List(Map("payload" -> convertedExamples)),
+      convertedExamples.map(example => Map("payload" -> (example :: Nil))),
       Nil
     )
   }
diff --git a/docs/asyncapi-docs/src/test/resources/expected_json_examples.yml b/docs/asyncapi-docs/src/test/resources/expected_json_examples.yml
index f3be214231..c3f86082d8 100644
--- a/docs/asyncapi-docs/src/test/resources/expected_json_examples.yml
+++ b/docs/asyncapi-docs/src/test/resources/expected_json_examples.yml
@@ -41,4 +41,5 @@ components:
       examples:
         - payload:
             - 10
+        - payload:
             - 42