diff --git a/site/src/components/TemplateLayout/TemplateLayout.tsx b/site/src/components/TemplateLayout/TemplateLayout.tsx
index 8363fcdd7bed5..7567d572207ef 100644
--- a/site/src/components/TemplateLayout/TemplateLayout.tsx
+++ b/site/src/components/TemplateLayout/TemplateLayout.tsx
@@ -106,35 +106,23 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
       organizationId,
     },
   })
-  const {
-    template,
-    activeTemplateVersion,
-    templateResources,
-    templateDAUs,
-    permissions: templatePermissions,
-  } = templateState.context
+  const { template, permissions: templatePermissions } = templateState.context
   const xServices = useContext(XServiceContext)
   const permissions = useSelector(xServices.authXService, selectPermissions)
-  const isLoading =
-    !template ||
-    !activeTemplateVersion ||
-    !templateResources ||
-    !permissions ||
-    !templateDAUs ||
-    !templatePermissions
-
   const hasIcon = template && template.icon && template.icon !== ""
 
+  if (!template) {
+    return <Loader />
+  }
+
   const generatePageHeaderActions = (): JSX.Element[] => {
     const pageActions: JSX.Element[] = []
 
-    if (!isLoading && templatePermissions.canUpdateTemplate) {
-      pageActions.push(<TemplateSettingsButton templateName={templateName} />)
+    if (templatePermissions?.canUpdateTemplate) {
+      pageActions.push(<TemplateSettingsButton templateName={template.name} />)
     }
 
-    if (!isLoading) {
-      pageActions.push(<CreateWorkspaceButton templateName={templateName} />)
-    }
+    pageActions.push(<CreateWorkspaceButton templateName={template.name} />)
 
     return pageActions
   }
@@ -152,65 +140,59 @@ export const TemplateLayout: FC<PropsWithChildren> = ({ children }) => {
           }
         >
           <Stack direction="row" spacing={3} className={styles.pageTitle}>
-            {!isLoading && (
-              <div>
-                {hasIcon ? (
-                  <div className={styles.iconWrapper}>
-                    <img src={template.icon} alt="" />
-                  </div>
-                ) : (
-                  <Avatar className={styles.avatar}>
-                    {firstLetter(templateName)}
-                  </Avatar>
-                )}
-              </div>
-            )}
+            <div>
+              {hasIcon ? (
+                <div className={styles.iconWrapper}>
+                  <img src={template.icon} alt="" />
+                </div>
+              ) : (
+                <Avatar className={styles.avatar}>
+                  {firstLetter(template.name)}
+                </Avatar>
+              )}
+            </div>
 
-            {!isLoading && (
-              <div>
-                <PageHeaderTitle>{templateName}</PageHeaderTitle>
-                <PageHeaderSubtitle condensed>
-                  {template.description === ""
-                    ? Language.noDescription
-                    : template.description}
-                </PageHeaderSubtitle>
-              </div>
-            )}
+            <div>
+              <PageHeaderTitle>{template.name}</PageHeaderTitle>
+              <PageHeaderSubtitle condensed>
+                {template.description === ""
+                  ? Language.noDescription
+                  : template.description}
+              </PageHeaderSubtitle>
+            </div>
           </Stack>
         </PageHeader>
       </Margins>
 
-      {!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>
-      )}
+      <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
diff --git a/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx b/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
index 8d86a9c3b031b..a71ab12d024cf 100644
--- a/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
@@ -13,7 +13,6 @@ 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>
@@ -26,14 +25,11 @@ export const TemplatePermissionsPage: FC<
     context: { templateId: template?.id },
   })
   const { templateACL, userToBeUpdated, groupToBeUpdated } = state.context
-  if (!template || !permissions) {
-    return <Loader />
-  }
 
   return (
     <>
       <Helmet>
-        <title>{pageTitle(`${template.name} · Permissions`)}</title>
+        <title>{pageTitle(`${template?.name} · Permissions`)}</title>
       </Helmet>
       <ChooseOne>
         <Cond condition={!isTemplateRBACEnabled}>
@@ -68,7 +64,7 @@ export const TemplatePermissionsPage: FC<
           <TemplatePermissionsPageView
             organizationId={organizationId}
             templateACL={templateACL}
-            canUpdatePermissions={permissions.canUpdateTemplate}
+            canUpdatePermissions={Boolean(permissions?.canUpdateTemplate)}
             onAddUser={(user, role, reset) => {
               send("ADD_USER", { user, role, onDone: reset })
             }}
diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx
index bfad63f8f0b5a..cc36c9595930d 100644
--- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx
+++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx
@@ -38,7 +38,7 @@ describe("TemplateSummaryPage", () => {
 
     renderPage()
     await screen.findByText(MockTemplate.name)
-    screen.getByTestId("markdown")
+    await screen.findByTestId("markdown")
     screen.getByText(MockWorkspaceResource.name)
     screen.queryAllByText(`${MockTemplateVersion.name}`).length
   })