diff --git a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPageView.tsx b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPageView.tsx
index 5826352024..fad5b1e94b 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPageView.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPageView.tsx
@@ -44,21 +44,23 @@ export const TemplateVariablesPageView: FC<TemplateVariablesPageViewProps> = ({
     !errors.getTemplateDataError &&
     !errors.updateTemplateError
   const { t } = useTranslation("templateVariablesPage")
-
+  const hasError = Object.values(errors).some((error) => Boolean(error))
   return (
     <>
       <PageHeader className={classes.pageHeader}>
         <PageHeaderTitle>{t("title")}</PageHeaderTitle>
       </PageHeader>
-      <div className={classes.errorContainer}>
-        {Boolean(errors.getTemplateDataError) && (
-          <ErrorAlert error={errors.getTemplateDataError} />
-        )}
-        {Boolean(errors.updateTemplateError) && (
-          <ErrorAlert error={errors.updateTemplateError} />
-        )}
-        {Boolean(errors.jobError) && <ErrorAlert error={errors.jobError} />}
-      </div>
+      {hasError && (
+        <div className={classes.errorContainer}>
+          {Boolean(errors.getTemplateDataError) && (
+            <ErrorAlert error={errors.getTemplateDataError} />
+          )}
+          {Boolean(errors.updateTemplateError) && (
+            <ErrorAlert error={errors.updateTemplateError} />
+          )}
+          {Boolean(errors.jobError) && <ErrorAlert error={errors.jobError} />}
+        </div>
+      )}
       {isLoading && <Loader />}
       {templateVersion && templateVariables && templateVariables.length > 0 && (
         <TemplateVariablesForm