diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
index 945d7292..8caab1dc 100644
--- a/src/layouts/404.hbs
+++ b/src/layouts/404.hbs
@@ -5,7 +5,7 @@
   </head>
   <body class="status-404">
 {{> header}}
-{{> body componentOrder=(dig (siteStartPage) 'asciidoc.attributes.page-component-order')}}
+{{> body}}
 {{> footer}}
   </body>
 </html>
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
index 8e68ca50..c5282ec1 100644
--- a/src/layouts/default.hbs
+++ b/src/layouts/default.hbs
@@ -5,7 +5,7 @@
   </head>
   <body class="article{{#with (or page.attributes.role page.role)}} {{{this}}}{{/with}}">
 {{> header}}
-{{> body componentOrder=page.attributes.component-order}}
+{{> body}}
 {{> footer}}
   </body>
 </html>
diff --git a/src/partials/nav-explore.hbs b/src/partials/nav-explore.hbs
index 40992cc3..73261fa1 100644
--- a/src/partials/nav-explore.hbs
+++ b/src/partials/nav-explore.hbs
@@ -6,7 +6,7 @@
   </div>
   {{/if}}
   <ul class="components">
-    {{#each (rearrange site.components 'name' componentOrder)}}
+    {{#each (rearrange site.components 'name' (or page.attributes.component-order (dig (siteStartPage) 'asciidoc.attributes.page-component-order')))}}
     <li class="component{{#if (eq this @root.page.component)}} is-current{{/if}}">
       <a class="title" href="{{{relativize ./url}}}">{{{./title}}}</a>
       {{#if (or ./versions.[1] (and (ne ./versions.[0].displayVersion 'default') (ne ./versions.[0].displayVersion 'pre-spec')))}}
