diff --git a/src/OnboardingSPA/steps/DesignHomepageMenu/index.js b/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
index 6e804ae59..91e772c7c 100644
--- a/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
+++ b/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
@@ -150,7 +150,7 @@ const StepDesignHomepageMenu = () => {
 									watch={ homepagePattern }
 									count={
 										themeVariations[
-											currentStep?.patternId
+											currentStep?.data?.patternId
 										]?.previewCount
 									}
 									callback={ buildHomepagePreviews }
diff --git a/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js b/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
index 1399570e2..9409a42ce 100644
--- a/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
+++ b/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
@@ -171,8 +171,9 @@ const StepDesignThemeStylesMenu = () => {
 							<LivePreviewSkeleton
 								className={ 'theme-styles-menu__list__item' }
 								count={
-									themeVariations[ currentStep?.patternId ]
-										?.previewCount
+									themeVariations[
+										currentStep?.data?.patternId
+									]?.previewCount
 								}
 								watch={ pattern && globalStyles }
 								callback={ buildPreviews }
diff --git a/src/OnboardingSPA/steps/SitePages/index.js b/src/OnboardingSPA/steps/SitePages/index.js
index 2cc3bec5e..bea7a884e 100644
--- a/src/OnboardingSPA/steps/SitePages/index.js
+++ b/src/OnboardingSPA/steps/SitePages/index.js
@@ -86,13 +86,13 @@ const StepSitePages = () => {
 	const stateToFlowData = ( selectedPages, pages ) => {
 		return pages !== false
 			? pages?.reduce( ( newSitePages, sitePage ) => {
-				return selectedPages.includes( sitePage.slug )
-					? newSitePages.concat( {
-						slug: sitePage.slug,
-						title: sitePage.title,
-					} )
-					: newSitePages;
-			}, [] )
+					return selectedPages.includes( sitePage.slug )
+						? newSitePages.concat( {
+								slug: sitePage.slug,
+								title: sitePage.title,
+						  } )
+						: newSitePages;
+			  }, [] )
 			: undefined;
 	};
 
@@ -170,7 +170,7 @@ const StepSitePages = () => {
 									className={ 'site-pages__list__item' }
 									count={
 										themeVariations[
-											currentStep?.patternId
+											currentStep?.data?.patternId
 										]?.previewCount
 									}
 									watch={ sitePages }