diff --git a/site/src/components/TemplateLayout/TemplateLayout.tsx b/site/src/components/TemplateLayout/TemplateLayout.tsx
index cf83b30f9c287..f7df905260566 100644
--- a/site/src/components/TemplateLayout/TemplateLayout.tsx
+++ b/site/src/components/TemplateLayout/TemplateLayout.tsx
@@ -9,7 +9,6 @@ import { ChooseOne, Cond } from "components/Conditionals/ChooseOne"
 import { DeleteDialog } from "components/Dialogs/DeleteDialog/DeleteDialog"
 import { DeleteButton } from "components/DropdownButton/ActionCtas"
 import { DropdownButton } from "components/DropdownButton/DropdownButton"
-import { Loader } from "components/Loader/Loader"
 import {
   PageHeader,
   PageHeaderSubtitle,
@@ -53,7 +52,7 @@ const useTemplateName = () => {
 
 type TemplateLayoutContextValue = {
   context: TemplateContext
-  permissions: Permissions
+  permissions?: Permissions
 }
 
 const TemplateLayoutContext = createContext<
@@ -97,23 +96,23 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
     !templateDAUs ||
     !templatePermissions
 
-  if (isLoading) {
-    return <Loader />
-  }
-
   if (templateState.matches("deleted")) {
     return <Navigate to="/templates" />
   }
 
-  const hasIcon = template.icon && template.icon !== ""
+  const hasIcon = template && template.icon && template.icon !== ""
 
   const createWorkspaceButton = (className?: string) => (
     <Link
       underline="none"
       component={RouterLink}
-      to={`/templates/${template.name}/workspace`}
+      to={`/templates/${templateName}/workspace`}
     >
-      <Button className={className ?? ""} startIcon={<AddCircleOutline />}>
+      <Button
+        className={className ?? ""}
+        startIcon={<AddCircleOutline />}
+        disabled={isLoading}
+      >
         {Language.createButton}
       </Button>
     </Link>
@@ -128,89 +127,98 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
       <Margins>
         <PageHeader
           actions={
-            <ChooseOne>
-              <Cond condition={templatePermissions.canUpdateTemplate}>
-                <Link
-                  underline="none"
-                  component={RouterLink}
-                  to={`/templates/${template.name}/settings`}
-                >
-                  <Button variant="outlined" startIcon={<SettingsOutlined />}>
-                    {Language.settingsButton}
-                  </Button>
-                </Link>
+            isLoading ? undefined : (
+              <ChooseOne>
+                <Cond condition={templatePermissions.canUpdateTemplate}>
+                  <Link
+                    underline="none"
+                    component={RouterLink}
+                    to={`/templates/${template.name}/settings`}
+                  >
+                    <Button variant="outlined" startIcon={<SettingsOutlined />}>
+                      {Language.settingsButton}
+                    </Button>
+                  </Link>
 
-                <DropdownButton
-                  primaryAction={createWorkspaceButton(styles.actionButton)}
-                  secondaryActions={[
-                    {
-                      action: "delete",
-                      button: (
-                        <DeleteButton handleAction={handleDeleteTemplate} />
-                      ),
-                    },
-                  ]}
-                  canCancel={false}
-                />
-              </Cond>
+                  <DropdownButton
+                    primaryAction={createWorkspaceButton(styles.actionButton)}
+                    secondaryActions={[
+                      {
+                        action: "delete",
+                        button: (
+                          <DeleteButton handleAction={handleDeleteTemplate} />
+                        ),
+                      },
+                    ]}
+                    canCancel={false}
+                  />
+                </Cond>
 
-              <Cond>{createWorkspaceButton()}</Cond>
-            </ChooseOne>
+                <Cond>{createWorkspaceButton()}</Cond>
+              </ChooseOne>
+            )
           }
         >
           <Stack direction="row" spacing={3} className={styles.pageTitle}>
-            <div>
-              {hasIcon ? (
-                <div className={styles.iconWrapper}>
-                  <img src={template.icon} alt="" />
-                </div>
-              ) : (
-                <Avatar className={styles.avatar}>
-                  {firstLetter(template.name)}
-                </Avatar>
-              )}
-            </div>
-            <div>
-              <PageHeaderTitle>{template.name}</PageHeaderTitle>
-              <PageHeaderSubtitle condensed>
-                {template.description === ""
-                  ? Language.noDescription
-                  : template.description}
-              </PageHeaderSubtitle>
-            </div>
+            {!isLoading && (
+              <div>
+                {hasIcon ? (
+                  <div className={styles.iconWrapper}>
+                    <img src={template.icon} alt="" />
+                  </div>
+                ) : (
+                  <Avatar className={styles.avatar}>
+                    {firstLetter(templateName)}
+                  </Avatar>
+                )}
+              </div>
+            )}
+
+            {!isLoading && (
+              <div>
+                <PageHeaderTitle>{templateName}</PageHeaderTitle>
+                <PageHeaderSubtitle condensed>
+                  {template.description === ""
+                    ? Language.noDescription
+                    : template.description}
+                </PageHeaderSubtitle>
+              </div>
+            )}
           </Stack>
         </PageHeader>
       </Margins>
 
-      <div className={styles.tabs}>
-        <Margins>
-          <Stack direction="row" spacing={0.25}>
-            <NavLink
-              end
-              to={`/templates/${template.name}`}
-              className={({ isActive }) =>
-                combineClasses([
-                  styles.tabItem,
-                  isActive ? styles.tabItemActive : undefined,
-                ])
-              }
-            >
-              Summary
-            </NavLink>
-            <NavLink
-              to={`/templates/${template.name}/permissions`}
-              className={({ isActive }) =>
-                combineClasses([
-                  styles.tabItem,
-                  isActive ? styles.tabItemActive : undefined,
-                ])
-              }
-            >
-              Permissions
-            </NavLink>
-          </Stack>
-        </Margins>
-      </div>
+      {!isLoading && (
+        <div className={styles.tabs}>
+          <Margins>
+            <Stack direction="row" spacing={0.25}>
+              <NavLink
+                end
+                to={`/templates/${template.name}`}
+                className={({ isActive }) =>
+                  combineClasses([
+                    styles.tabItem,
+                    isActive ? styles.tabItemActive : undefined,
+                  ])
+                }
+              >
+                Summary
+              </NavLink>
+              <NavLink
+                to={`/templates/${template.name}/permissions`}
+                className={({ isActive }) =>
+                  combineClasses([
+                    styles.tabItem,
+                    isActive ? styles.tabItemActive : undefined,
+                  ])
+                }
+              >
+                Permissions
+              </NavLink>
+            </Stack>
+          </Margins>
+        </div>
+      )}
 
       <Margins>
         <TemplateLayoutContext.Provider
@@ -220,18 +228,20 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
         </TemplateLayoutContext.Provider>
       </Margins>
 
-      <DeleteDialog
-        isOpen={templateState.matches("confirmingDelete")}
-        confirmLoading={templateState.matches("deleting")}
-        onConfirm={() => {
-          templateSend("CONFIRM_DELETE")
-        }}
-        onCancel={() => {
-          templateSend("CANCEL_DELETE")
-        }}
-        entity="template"
-        name={template.name}
-      />
+      {!isLoading && (
+        <DeleteDialog
+          isOpen={templateState.matches("confirmingDelete")}
+          confirmLoading={templateState.matches("deleting")}
+          onConfirm={() => {
+            templateSend("CONFIRM_DELETE")
+          }}
+          onCancel={() => {
+            templateSend("CANCEL_DELETE")
+          }}
+          entity="template"
+          name={template.name}
+        />
+      )}
     </>
   )
 }
diff --git a/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx b/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
index 48cc936d0cea4..8d86a9c3b031b 100644
--- a/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
@@ -13,6 +13,7 @@ import { Helmet } from "react-helmet-async"
 import { pageTitle } from "util/page"
 import { templateACLMachine } from "xServices/template/templateACLXService"
 import { TemplatePermissionsPageView } from "./TemplatePermissionsPageView"
+import { Loader } from "components/Loader/Loader"
 
 export const TemplatePermissionsPage: FC<
   React.PropsWithChildren<unknown>
@@ -20,16 +21,14 @@ export const TemplatePermissionsPage: FC<
   const organizationId = useOrganizationId()
   const { context } = useTemplateLayoutContext()
   const { template, permissions } = context
-  if (!template || !permissions) {
-    throw new Error(
-      "This page should not be displayed until template or permissions being loaded.",
-    )
-  }
   const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility()
   const [state, send] = useMachine(templateACLMachine, {
-    context: { templateId: template.id },
+    context: { templateId: template?.id },
   })
   const { templateACL, userToBeUpdated, groupToBeUpdated } = state.context
+  if (!template || !permissions) {
+    return <Loader />
+  }
 
   return (
     <>
diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
index 6a5718e613742..dbc8e7b820b25 100644
--- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx
@@ -3,6 +3,7 @@ import { FC } from "react"
 import { Helmet } from "react-helmet-async"
 import { pageTitle } from "util/page"
 import { TemplateSummaryPageView } from "./TemplateSummaryPageView"
+import { Loader } from "components/Loader/Loader"
 
 export const TemplateSummaryPage: FC = () => {
   const { context } = useTemplateLayoutContext()
@@ -16,9 +17,7 @@ export const TemplateSummaryPage: FC = () => {
   } = context
 
   if (!template || !activeTemplateVersion || !templateResources) {
-    throw new Error(
-      "This page should not be displayed until template, activeTemplateVersion or templateResources being loaded.",
-    )
+    return <Loader />
   }
 
   return (