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