diff --git a/src/OnboardingSPA/components/Header/components/SiteBuildHeader/step-navigation.js b/src/OnboardingSPA/components/Header/components/SiteBuildHeader/step-navigation.js
index 7748abe96..77f33c2ca 100644
--- a/src/OnboardingSPA/components/Header/components/SiteBuildHeader/step-navigation.js
+++ b/src/OnboardingSPA/components/Header/components/SiteBuildHeader/step-navigation.js
@@ -126,8 +126,19 @@ const StepNavigation = () => {
 			showErrorDialog: select( nfdOnboardingStore ).getShowErrorDialog(),
 		};
 	}, [] );
-	const isFirstStep = null === previousStep || false === previousStep;
+	let isFirstStep = null === previousStep || false === previousStep;
 	const isLastStep = null === nextStep || false === nextStep;
+
+	let isDisabled = false;
+	if ( currentStep === stepWelcome ) {
+		if ( currentData.continueWithoutAi === true ) {
+			isFirstStep = false;
+			isDisabled = false;
+		} else {
+			isFirstStep = true;
+		}
+	}
+
 	return (
 		<div className="nfd-onboarding-header__step-navigation">
 			<ButtonGroup style={ { display: 'flex', columnGap: '0.5rem' } }>
@@ -135,11 +146,7 @@ const StepNavigation = () => {
 					<Back
 						path={ previousStep.path }
 						showErrorDialog={ showErrorDialog }
-						disabled={
-							currentStep === stepWelcome
-								? currentData.continueWithoutAi
-								: false
-						}
+						disabled={ isDisabled }
 					/>
 				) }
 				{ isLastStep ? (
diff --git a/src/OnboardingSPA/components/StartOptions/index.js b/src/OnboardingSPA/components/StartOptions/index.js
index 64be9a629..2c9918619 100644
--- a/src/OnboardingSPA/components/StartOptions/index.js
+++ b/src/OnboardingSPA/components/StartOptions/index.js
@@ -29,7 +29,6 @@ const StartOptions = ( { questionnaire, oldFlow, options } ) => {
 		updateDesignRoutes,
 		updateInitialize,
 		setCurrentOnboardingData,
-		setContinueWithoutAi,
 	} = useDispatch( nfdOnboardingStore );
 
 	const switchFlow = ( newFlow ) => {
@@ -49,8 +48,7 @@ const StartOptions = ( { questionnaire, oldFlow, options } ) => {
 
 		window.nfdOnboarding.currentFlow = newFlow;
 		currentData.activeFlow = newFlow;
-		currentData.continueWithoutAi = false;
-		setContinueWithoutAi( false );
+		currentData.continueWithoutAi = true;
 		setCurrentOnboardingData( currentData );
 		if ( SITEGEN_FLOW !== newFlow ) {
 			updateInitialize( true );