core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 2d14619..b6eaf59 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -125,9 +125,6 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
     if (!isset($page['#type']) || $page['#type'] !== 'page') {
       throw new \LogicException('Must be #type page');
     }
-    if (!isset($page['#cache'])) {
-      throw new \LogicException('Must have cacheability metadata');
-    }
 
     $page['#title'] = $title;
 
@@ -226,6 +223,9 @@ protected function prepare(array $main_content, Request $request, RouteMatchInte
       // @todo Remove this once https://www.drupal.org/node/2359901 lands.
       if (!empty($main_content)) {
         $this->renderer->executeInRenderContext(new RenderContext(), function() use (&$main_content) {
+          if (!isset($main_content['#cache'])) {
+            throw new \LogicException('Must have cacheability metadata.');
+          }
           if (isset($main_content['#cache']['keys'])) {
             // Retain #title, otherwise, dynamically generated titles would be
             // missing for controllers whose entire returned render array is