diff --git a/src/OnboardingSPA/components/StateHandlers/Flow/index.js b/src/OnboardingSPA/components/StateHandlers/Flow/index.js
index 88b095d70..9ed50cd17 100644
--- a/src/OnboardingSPA/components/StateHandlers/Flow/index.js
+++ b/src/OnboardingSPA/components/StateHandlers/Flow/index.js
@@ -91,7 +91,9 @@ const FlowStateHandler = () => {
 
 	const checkCapability = () => {
 		if ( ! validateFlow( brandConfig, SITEGEN_FLOW ) ) {
-			const getData = resolveGetDataForFlow( DEFAULT_FLOW );
+			const getData = resolveGetDataForFlow(
+				window.nfdOnboarding.currentFlow
+			);
 			const data = getData();
 
 			const updateAllStep = removeFromAllSteps( data.steps, [