diff --git a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
index 8b0b3f8c1..74f059d87 100644
--- a/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
+++ b/src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteGen/index.js
@@ -73,6 +73,13 @@ const SiteGen = () => {
 				.then( ( data ) => {
 					if ( data.body !== null ) {
 						currentData.sitegen.siteGenMetaStatus.currentStatus += 1;
+						if (
+							currentData.sitegen.siteGenMetaStatus
+								.currentStatus ===
+							currentData.sitegen.siteGenMetaStatus.totalCount
+						) {
+							currentData.sitegen.skipCache = false;
+						}
 						setCurrentOnboardingData( currentData );
 					} else if ( retryCount < MAX_RETRIES_SITE_GEN ) {
 						performSiteGenMetaGeneration(
diff --git a/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js b/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
index cbf730246..83a2f043c 100644
--- a/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
+++ b/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
@@ -49,6 +49,7 @@ const SiteGenSiteDetails = () => {
 
 	useEffect( () => {
 		if (
+			customerInput !== undefined &&
 			customerInput !== '' &&
 			customerInput !== currentData.sitegen.siteDetails.prompt
 		) {