diff --git a/src/Controller/Frontend/HomepageController.php b/src/Controller/Frontend/HomepageController.php
index 43a4d760..60adf12c 100644
--- a/src/Controller/Frontend/HomepageController.php
+++ b/src/Controller/Frontend/HomepageController.php
@@ -22,6 +22,12 @@ class HomepageController extends TwigAwareController implements FrontendZoneInte
     public function homepage(ContentRepository $contentRepository): Response
     {
         $homepage = $this->config->get('theme/homepage') ?: $this->config->get('general/homepage');
+        $templates = $this->templateChooser->forHomepage();
+
+        if ($homepage === null) {
+            return $this->render($templates);
+        }
+
         $homepageTokens = explode('/', $homepage);
         $contentType = $this->config->get('contenttypes/' . $homepageTokens[0]);
 
@@ -47,8 +53,6 @@ class HomepageController extends TwigAwareController implements FrontendZoneInte
             $record = $contentRepository->findOneBy(['contentType' => $homepageTokens[0]]);
         }
 
-        $templates = $this->templateChooser->forHomepage();
-
         return $this->renderSingle($record, false, $templates);
     }
 }