diff --git a/.changeset/silly-paws-show.md b/.changeset/silly-paws-show.md
new file mode 100644
index 000000000..3da07ef59
--- /dev/null
+++ b/.changeset/silly-paws-show.md
@@ -0,0 +1,5 @@
+---
+"@gitbook/react-openapi": patch
+---
+
+Make OpenAPI Response structure clearer
diff --git a/packages/react-openapi/src/OpenAPIResponse.tsx b/packages/react-openapi/src/OpenAPIResponse.tsx
index 585071b6c..9dbfa293d 100644
--- a/packages/react-openapi/src/OpenAPIResponse.tsx
+++ b/packages/react-openapi/src/OpenAPIResponse.tsx
@@ -1,7 +1,7 @@
 import type { OpenAPIV3 } from '@gitbook/openapi-parser';
 import { OpenAPIDisclosure } from './OpenAPIDisclosure';
 import { OpenAPISchemaPresentation } from './OpenAPISchema';
-import { OpenAPISchemaProperties } from './OpenAPISchemaServer';
+import { OpenAPIRootSchema, OpenAPISchemaProperties } from './OpenAPISchemaServer';
 import type { OpenAPIClientContext } from './context';
 import { tString } from './translate';
 import { parameterToProperty, resolveDescription } from './utils';
@@ -64,17 +64,21 @@ export function OpenAPIResponse(props: {
             ) : null}
             {mediaType?.schema && (
                 <div className="openapi-responsebody">
-                    <OpenAPISchemaProperties
-                        id={`response-${context.blockKey}`}
-                        properties={[
-                            {
-                                schema: mediaType.schema,
-                                propertyName: tString(context.translation, 'response'),
-                                required: null,
-                            },
-                        ]}
-                        context={context}
-                    />
+                    {headers.length > 0 ? (
+                        <OpenAPISchemaProperties
+                            id={`response-${context.blockKey}`}
+                            properties={[
+                                {
+                                    schema: mediaType.schema,
+                                    propertyName: tString(context.translation, 'response'),
+                                    required: null,
+                                },
+                            ]}
+                            context={context}
+                        />
+                    ) : (
+                        <OpenAPIRootSchema schema={mediaType.schema} context={context} />
+                    )}
                 </div>
             )}
         </div>