diff --git a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Discriminator/Discriminator.jsx b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Discriminator/Discriminator.jsx
index 900f076a..7cf2270f 100644
--- a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Discriminator/Discriminator.jsx
+++ b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Discriminator/Discriminator.jsx
@@ -12,6 +12,7 @@ const Discriminator = ({ schema, getSystem }) => {
   const { fn, getComponent } = getSystem()
   const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
   const isExpandedDeeply = useIsExpandedDeeply()
+  const isExpandable = !!discriminator.mapping
   const [expanded, setExpanded] = useState(isExpandedDeeply)
   const [expandedDeeply, setExpandedDeeply] = useState(false)
   const Accordion = useComponent("Accordion")
@@ -41,12 +42,24 @@ const Discriminator = ({ schema, getSystem }) => {
   return (
     <JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
       <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--discriminator">
-        <Accordion expanded={expanded} onChange={handleExpansion}>
+        {isExpandable ? (
+          <>
+            <Accordion expanded={expanded} onChange={handleExpansion}>
+              <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
+                Discriminator
+              </span>
+            </Accordion>
+            <ExpandDeepButton
+              expanded={expanded}
+              onClick={handleExpansionDeep}
+            />
+          </>
+        ) : (
           <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
             Discriminator
           </span>
-        </Accordion>
-        <ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
+        )}
+
         {discriminator.propertyName && (
           <span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--muted">
             {discriminator.propertyName}
diff --git a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/ExternalDocs.jsx b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/ExternalDocs.jsx
index 4c5c3c6c..0308f2ec 100644
--- a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/ExternalDocs.jsx
+++ b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/ExternalDocs.jsx
@@ -12,6 +12,7 @@ const ExternalDocs = ({ schema, getSystem }) => {
   const { fn, getComponent } = getSystem()
   const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
   const isExpandedDeeply = useIsExpandedDeeply()
+  const isExpandable = !!(externalDocs.description || externalDocs.url)
   const [expanded, setExpanded] = useState(isExpandedDeeply)
   const [expandedDeeply, setExpandedDeeply] = useState(false)
   const Accordion = useComponent("Accordion")
@@ -43,12 +44,23 @@ const ExternalDocs = ({ schema, getSystem }) => {
   return (
     <JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
       <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--externalDocs">
-        <Accordion expanded={expanded} onChange={handleExpansion}>
+        {isExpandable ? (
+          <>
+            <Accordion expanded={expanded} onChange={handleExpansion}>
+              <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
+                External documentation
+              </span>
+            </Accordion>
+            <ExpandDeepButton
+              expanded={expanded}
+              onClick={handleExpansionDeep}
+            />
+          </>
+        ) : (
           <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
             External documentation
           </span>
-        </Accordion>
-        <ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
+        )}
         <strong className="json-schema-2020-12__attribute json-schema-2020-12__attribute--primary">
           object
         </strong>
diff --git a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Xml.jsx b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Xml.jsx
index 723aa8bf..2ddba20e 100644
--- a/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Xml.jsx
+++ b/src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Xml.jsx
@@ -10,6 +10,7 @@ const Xml = ({ schema, getSystem }) => {
   const { fn, getComponent } = getSystem()
   const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
   const isExpandedDeeply = useIsExpandedDeeply()
+  const isExpandable = !!(xml.name || xml.namespace || xml.prefix)
   const [expanded, setExpanded] = useState(isExpandedDeeply)
   const [expandedDeeply, setExpandedDeeply] = useState(false)
   const Accordion = useComponent("Accordion")
@@ -39,12 +40,23 @@ const Xml = ({ schema, getSystem }) => {
   return (
     <JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
       <div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--xml">
-        <Accordion expanded={expanded} onChange={handleExpansion}>
+        {isExpandable ? (
+          <>
+            <Accordion expanded={expanded} onChange={handleExpansion}>
+              <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
+                XML
+              </span>
+            </Accordion>
+            <ExpandDeepButton
+              expanded={expanded}
+              onClick={handleExpansionDeep}
+            />
+          </>
+        ) : (
           <span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
             XML
           </span>
-        </Accordion>
-        <ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
+        )}
         {xml.attribute === true && (
           <span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--muted">
             attribute