diff --git a/application/src/Controller/SiteAdmin/IndexController.php b/application/src/Controller/SiteAdmin/IndexController.php
index 7b4d04cb5..98f0f45a2 100644
--- a/application/src/Controller/SiteAdmin/IndexController.php
+++ b/application/src/Controller/SiteAdmin/IndexController.php
@@ -152,7 +152,7 @@ public function addPageAction()
                 $formData = $form->getData();
                 $formData['o:site']['o:id'] = $site->id();
                 $formData['o:is_public'] = !empty($post['o:is_public']);
-                $formData['o:layout_data']['template_name'] = $post['template_name'];
+                $formData['o:layout_data']['template_name'] = $post['template_name'] ?? null;
                 $response = $this->api($form)->create('site_pages', $formData);
                 if ($response) {
                     $page = $response->getContent();
diff --git a/application/view/omeka/site/page/show.phtml b/application/view/omeka/site/page/show.phtml
index 645f7abe7..b57631f22 100644
--- a/application/view/omeka/site/page/show.phtml
+++ b/application/view/omeka/site/page/show.phtml
@@ -12,7 +12,7 @@ switch ($this->siteSetting('subnav_display')) {
         $displaySubnav = false;
         break;
     default:
-        $displaySubnav = $this->displayNavigation && $activePage['page']->hasPages();
+        $displaySubnav = $this->displayNavigation && $activePage && $activePage['page']->hasPages();
 }
 $showPagePagination = $this->siteSetting('show_page_pagination', true);
 ?>