diff --git a/developer-docs/docs.json b/developer-docs/docs.json
index 40466b542..97e6008e2 100644
--- a/developer-docs/docs.json
+++ b/developer-docs/docs.json
@@ -16,7 +16,7 @@
     "tabs": [
       {
         "tab": "API Documentation",
-        "openapi": "https://raw.githubusercontent.com/chatwoot/chatwoot/bde4833e4f866b1fc9dcdbcc14267351406069a3/swagger/swagger.json"
+        "openapi": "https://raw.githubusercontent.com/chatwoot/chatwoot/ac94e34c723731ef7f9caf839c2616bd96ef89c1/swagger/swagger.json"
       }
     ]
   },
diff --git a/swagger/paths/application/conversation/messages/index.yml b/swagger/paths/application/conversation/messages/index.yml
index fc6882b33..02693a244 100644
--- a/swagger/paths/application/conversation/messages/index.yml
+++ b/swagger/paths/application/conversation/messages/index.yml
@@ -11,12 +11,32 @@ responses:
     content:
       application/json:
         schema:
-          type: array
-          description: Array of messages
-          items:
-            allOf:
-              - $ref: '#/components/schemas/generic_id'
-              - $ref: '#/components/schemas/message'
+          type: object
+          properties:
+            meta:
+              type: object
+              properties:
+                labels:
+                  type: array
+                  items:
+                    type: string
+                additional_attributes:
+                  type: object
+                contact:
+                  $ref: '#/components/schemas/contact'
+                assignee:
+                  $ref: '#/components/schemas/agent'
+                agent_last_seen_at:
+                  type: string
+                  format: date-time
+                assignee_last_seen_at:
+                  type: string
+                  format: date-time
+            payload:
+              type: array
+              description: Array of messages
+              items:
+                $ref: '#/components/schemas/message'
   '404':
     description: Conversation not found
     content:
diff --git a/swagger/paths/application/inboxes/inbox_members/create.yml b/swagger/paths/application/inboxes/inbox_members/create.yml
index 1f1396bd3..47dcb8b2e 100644
--- a/swagger/paths/application/inboxes/inbox_members/create.yml
+++ b/swagger/paths/application/inboxes/inbox_members/create.yml
@@ -31,10 +31,13 @@ responses:
     content:
       application/json:
         schema:
-          type: array
-          description: 'Array of all active agents'
-          items:
-            $ref: '#/components/schemas/agent'
+          type: object
+          properties:
+            payload:
+              type: array
+              description: 'Array of all active agents'
+              items:
+                $ref: '#/components/schemas/agent'
   '404':
     description: Inbox not found
     content:
diff --git a/swagger/paths/application/inboxes/inbox_members/show.yml b/swagger/paths/application/inboxes/inbox_members/show.yml
index 65ec9f969..ec10a5f0b 100644
--- a/swagger/paths/application/inboxes/inbox_members/show.yml
+++ b/swagger/paths/application/inboxes/inbox_members/show.yml
@@ -13,10 +13,13 @@ responses:
     content:
       application/json:
         schema:
-          type: array
-          description: 'Array of all active agents'
-          items:
-            $ref: '#/components/schemas/agent'
+          type: object
+          properties:
+            payload:
+              type: array
+              description: 'Array of all active agents'
+              items:
+                $ref: '#/components/schemas/agent'
   '404':
     description: Inbox not found
     content:
diff --git a/swagger/paths/application/inboxes/inbox_members/update.yml b/swagger/paths/application/inboxes/inbox_members/update.yml
index 18fc3f2c8..728c2a028 100644
--- a/swagger/paths/application/inboxes/inbox_members/update.yml
+++ b/swagger/paths/application/inboxes/inbox_members/update.yml
@@ -31,10 +31,13 @@ responses:
     content:
       application/json:
         schema:
-          type: array
-          description: 'Array of all active agents'
-          items:
-            $ref: '#/components/schemas/agent'
+          type: object
+          properties:
+            payload:
+              type: array
+              description: 'Array of all active agents'
+              items:
+                $ref: '#/components/schemas/agent'
   '404':
     description: Inbox not found
     content:
diff --git a/swagger/paths/application/inboxes/index.yml b/swagger/paths/application/inboxes/index.yml
index 7856319ec..89abb6009 100644
--- a/swagger/paths/application/inboxes/index.yml
+++ b/swagger/paths/application/inboxes/index.yml
@@ -14,10 +14,13 @@ get:
       content:
         application/json:
           schema:
-            type: array
-            description: 'Array of inboxes'
-            items:
-              $ref: '#/components/schemas/inbox'
+            type: object
+            properties:
+              payload:
+                type: array
+                description: 'Array of inboxes'
+                items:
+                  $ref: '#/components/schemas/inbox'
     '404':
       description: Inbox not found
       content:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index b1040eb3c..6b2026365 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5091,10 +5091,15 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "description": "Array of inboxes",
-                  "items": {
-                    "$ref": "#/components/schemas/inbox"
+                  "type": "object",
+                  "properties": {
+                    "payload": {
+                      "type": "array",
+                      "description": "Array of inboxes",
+                      "items": {
+                        "$ref": "#/components/schemas/inbox"
+                      }
+                    }
                   }
                 }
               }
@@ -5496,10 +5501,15 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "description": "Array of all active agents",
-                  "items": {
-                    "$ref": "#/components/schemas/agent"
+                  "type": "object",
+                  "properties": {
+                    "payload": {
+                      "type": "array",
+                      "description": "Array of all active agents",
+                      "items": {
+                        "$ref": "#/components/schemas/agent"
+                      }
+                    }
                   }
                 }
               }
@@ -5585,10 +5595,15 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "description": "Array of all active agents",
-                  "items": {
-                    "$ref": "#/components/schemas/agent"
+                  "type": "object",
+                  "properties": {
+                    "payload": {
+                      "type": "array",
+                      "description": "Array of all active agents",
+                      "items": {
+                        "$ref": "#/components/schemas/agent"
+                      }
+                    }
                   }
                 }
               }
@@ -5677,10 +5692,15 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "description": "Array of all active agents",
-                  "items": {
-                    "$ref": "#/components/schemas/agent"
+                  "type": "object",
+                  "properties": {
+                    "payload": {
+                      "type": "array",
+                      "description": "Array of all active agents",
+                      "items": {
+                        "$ref": "#/components/schemas/agent"
+                      }
+                    }
                   }
                 }
               }
@@ -5825,17 +5845,43 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "description": "Array of messages",
-                  "items": {
-                    "allOf": [
-                      {
-                        "$ref": "#/components/schemas/generic_id"
-                      },
-                      {
+                  "type": "object",
+                  "properties": {
+                    "meta": {
+                      "type": "object",
+                      "properties": {
+                        "labels": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "additional_attributes": {
+                          "type": "object"
+                        },
+                        "contact": {
+                          "$ref": "#/components/schemas/contact"
+                        },
+                        "assignee": {
+                          "$ref": "#/components/schemas/agent"
+                        },
+                        "agent_last_seen_at": {
+                          "type": "string",
+                          "format": "date-time"
+                        },
+                        "assignee_last_seen_at": {
+                          "type": "string",
+                          "format": "date-time"
+                        }
+                      }
+                    },
+                    "payload": {
+                      "type": "array",
+                      "description": "Array of messages",
+                      "items": {
                         "$ref": "#/components/schemas/message"
                       }
-                    ]
+                    }
                   }
                 }
               }