From f6ac6686b4393e4add35d35cd40590e37d447249 Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden@coder.com>
Date: Mon, 2 Jun 2025 14:14:35 +0000
Subject: [PATCH 1/2] fix: flashing error dialog in create workspace page

---
 .../CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
index 90de67fb1129a..1c20552ea2dcb 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
@@ -47,7 +47,7 @@ const CreateWorkspaceExperimentRouter: FC = () => {
 		if (optOutQuery.isLoading) {
 			return <Loader />;
 		}
-		if (!optOutQuery.data) {
+		if (optOutQuery.isError) {
 			return <ErrorAlert error={optOutQuery.error} />;
 		}
 
@@ -64,7 +64,7 @@ const CreateWorkspaceExperimentRouter: FC = () => {
 		};
 		return (
 			<ExperimentalFormContext.Provider value={{ toggleOptedOut }}>
-				{optOutQuery.data.optedOut ? (
+				{optOutQuery.data?.optedOut ? (
 					<CreateWorkspacePage />
 				) : (
 					<CreateWorkspacePageExperimental />

From 03e6df3cddceea42685b8374a13ce5be44870dcd Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden@coder.com>
Date: Mon, 2 Jun 2025 20:05:58 +0000
Subject: [PATCH 2/2] chore: update for PR review

---
 .../CreateWorkspaceExperimentRouter.tsx                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
index 1c20552ea2dcb..4f2d0a4e4f8f7 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspaceExperimentRouter.tsx
@@ -44,12 +44,12 @@ const CreateWorkspaceExperimentRouter: FC = () => {
 	});
 
 	if (dynamicParametersEnabled) {
-		if (optOutQuery.isLoading) {
-			return <Loader />;
-		}
 		if (optOutQuery.isError) {
 			return <ErrorAlert error={optOutQuery.error} />;
 		}
+		if (!optOutQuery.data) {
+			return <Loader />;
+		}
 
 		const toggleOptedOut = () => {
 			const key = optOutKey(optOutQuery.data?.templateId ?? "");
@@ -64,7 +64,7 @@ const CreateWorkspaceExperimentRouter: FC = () => {
 		};
 		return (
 			<ExperimentalFormContext.Provider value={{ toggleOptedOut }}>
-				{optOutQuery.data?.optedOut ? (
+				{optOutQuery.data.optedOut ? (
 					<CreateWorkspacePage />
 				) : (
 					<CreateWorkspacePageExperimental />