From 912f2bec43c60fd58b98a4de05667ba178bce4d6 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Wed, 19 Feb 2025 19:18:10 +0000
Subject: [PATCH 1/2] fix: rearrange render logic

---
 site/src/pages/HealthPage/HealthLayout.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/HealthPage/HealthLayout.tsx b/site/src/pages/HealthPage/HealthLayout.tsx
index 33ca8cbe31a17..39dbed3597380 100644
--- a/site/src/pages/HealthPage/HealthLayout.tsx
+++ b/site/src/pages/HealthPage/HealthLayout.tsx
@@ -47,18 +47,18 @@ export const HealthLayout: FC = () => {
 	const link = useClassName(classNames.link, []);
 	const activeLink = useClassName(classNames.activeLink, []);
 
-	if (isLoading || !healthStatus) {
+	if (error) {
 		return (
 			<div className="p-6">
-				<Loader />
+				<ErrorAlert error={error} />
 			</div>
 		);
 	}
 
-	if (error) {
+	if (isLoading || !healthStatus) {
 		return (
 			<div className="p-6">
-				<ErrorAlert error={error} />
+				<Loader />
 			</div>
 		);
 	}

From 8f7e28943e235a2580bb5b122f83492cc288e446 Mon Sep 17 00:00:00 2001
From: Brett Kolodny <brett.kolodny@coder.com>
Date: Wed, 19 Feb 2025 19:53:53 +0000
Subject: [PATCH 2/2] fix: rearrange

---
 site/src/pages/HealthPage/HealthLayout.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/HealthPage/HealthLayout.tsx b/site/src/pages/HealthPage/HealthLayout.tsx
index 39dbed3597380..c520fd764fea1 100644
--- a/site/src/pages/HealthPage/HealthLayout.tsx
+++ b/site/src/pages/HealthPage/HealthLayout.tsx
@@ -47,18 +47,18 @@ export const HealthLayout: FC = () => {
 	const link = useClassName(classNames.link, []);
 	const activeLink = useClassName(classNames.activeLink, []);
 
-	if (error) {
+	if (isLoading) {
 		return (
 			<div className="p-6">
-				<ErrorAlert error={error} />
+				<Loader />
 			</div>
 		);
 	}
 
-	if (isLoading || !healthStatus) {
+	if (error || !healthStatus) {
 		return (
 			<div className="p-6">
-				<Loader />
+				<ErrorAlert error={error} />
 			</div>
 		);
 	}