diff --git a/src/core/plugins/json-schema-5/components/models.jsx b/src/core/plugins/json-schema-5/components/models.jsx
index e0e552219fb..90d7c883dd1 100644
--- a/src/core/plugins/json-schema-5/components/models.jsx
+++ b/src/core/plugins/json-schema-5/components/models.jsx
@@ -113,8 +113,6 @@ const Models = ({
     layoutActions,
   ])
 
-  if (!definitions.size || defaultModelsExpandDepth < 0) return null
-
   const showModels = layoutSelectors.isShown(
     specPathBase,
     defaultModelsExpandDepth > 0 && docExpansion !== "none"
@@ -124,6 +122,8 @@ const Models = ({
     layoutActions.show(specPathBase, !showModels)
   }, [layoutActions, specPathBase, showModels])
 
+  if (!definitions.size || defaultModelsExpandDepth < 0) return null
+
   const Collapse = getComponent("Collapse")
   const ArrowUpIcon = getComponent("ArrowUpIcon")
   const ArrowDownIcon = getComponent("ArrowDownIcon")