diff --git a/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx b/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
index 5050018096..4a11562bb1 100644
--- a/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
+++ b/site/src/pages/TemplateBuilder/TemplateBuilderPageView.tsx
@@ -254,6 +254,8 @@ function computeCanContinue(
 	moduleVarMap: Record<string, Record<string, string>>,
 ): boolean {
 	switch (stepId) {
+		case "base-infra":
+			return state.selectedBase !== null;
 		case "base-parameters":
 			return baseParametersComplete(
 				basesData,