diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
index 7d22316bfe..365acfbacc 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -516,7 +516,18 @@ export const CreateWorkspacePageViewExperimental: FC<
 					<div className="flex flex-row justify-end">
 						<Button
 							type="submit"
-							disabled={creatingWorkspace || !hasAllRequiredExternalAuth}
+							disabled={
+								creatingWorkspace ||
+								!hasAllRequiredExternalAuth ||
+								diagnostics.some(
+									(diagnostic) => diagnostic.severity === "error",
+								) ||
+								parameters.some((parameter) =>
+									parameter.diagnostics.some(
+										(diagnostic) => diagnostic.severity === "error",
+									),
+								)
+							}
 						>
 							<Spinner loading={creatingWorkspace} />
 							Create workspace