diff --git a/src/OnboardingSPA/components/MiniPreview/index.js b/src/OnboardingSPA/components/MiniPreview/index.js
index a49f3e638..b8a4c4d33 100644
--- a/src/OnboardingSPA/components/MiniPreview/index.js
+++ b/src/OnboardingSPA/components/MiniPreview/index.js
@@ -1,9 +1,9 @@
-
 import { __, sprintf } from '@wordpress/i18n';
 import { useState, useEffect } from '@wordpress/element';
 
 import content from './miniPreview.json';
 import { translations } from '../../utils/locales/translations';
+
 /**
  * A Mini Preview Section.
  *
@@ -30,7 +30,10 @@ const MiniPreview = ({ title, desc, icon, socialData, isSocialFormOpen, setIsSoc
         setInstagram(socialData?.instagram_url ?? "");
         setYouTube(socialData?.youtube_url ?? "");
         setLinkedIn(socialData?.linkedin_url ?? "");
-        if (Object.keys(socialData).includes("other_social_urls"))
+        if (
+			socialData &&
+			Object.keys( socialData ).includes( 'other_social_urls' )
+		)
         {
             const otherURLS = socialData.other_social_urls;
             if (Object.keys(otherURLS).includes("yelp_url"))
diff --git a/src/OnboardingSPA/components/SocialMediaForm/index.js b/src/OnboardingSPA/components/SocialMediaForm/index.js
index 16f24265e..f1ca92de4 100644
--- a/src/OnboardingSPA/components/SocialMediaForm/index.js
+++ b/src/OnboardingSPA/components/SocialMediaForm/index.js
@@ -53,7 +53,10 @@ const SocialMediaForm = ({ socialData, setSocialData, setIsValidSocials, isSocia
         setInstagram(socialData?.instagram_url ?? "");
         setYouTube(socialData?.youtube_url ?? "");
         setLinkedIn(socialData?.linkedin_url ?? "");
-        if (Object.keys(socialData).includes("other_social_urls"))
+        if (
+			socialData &&
+			Object.keys( socialData ).includes( 'other_social_urls' )
+		)
         {
             const otherURLS = socialData.other_social_urls;
             if (Object.keys(otherURLS).includes("yelp_url"))
diff --git a/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js b/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js
index 8e3152fb3..a2876a5fc 100644
--- a/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js
+++ b/src/OnboardingSPA/pages/Steps/BasicInfo/basicInfoForm.js
@@ -2,11 +2,11 @@ import { __, sprintf } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { useState, useEffect, useRef } from '@wordpress/element';
-
 import content from './content.json';
 import TextInput from '../../../components/TextInput';
 import SkipButton from '../../../components/SkipButton';
 import MiniPreview from '../../../components/MiniPreview';
+import Animate from '../../../components/Animate';
 import { getSettings } from '../../../utils/api/settings';
 import { store as nfdOnboardingStore } from '../../../store';
 import ImageUploader from '../../../components/ImageUploader';
@@ -19,7 +19,7 @@ import { translations } from '../../../utils/locales/translations';
  * @return
  */
 const BasicInfoForm = () => {
-	const socialMediaRef = useRef(null);
+	const socialMediaRef = useRef( null );
 	const [ isError, setIsError ] = useState( false );
 	const [ flowData, setFlowData ] = useState();
 	const [ isLoaded, setisLoaded ] = useState( false );
@@ -28,7 +28,7 @@ const BasicInfoForm = () => {
 	const [ siteTitle, setSiteTitle ] = useState( '' );
 	const [ siteDesc, setSiteDesc ] = useState( '' );
 	const [ siteLogo, setSiteLogo ] = useState( 0 );
-	const [ socialData, setSocialData ] = useState( '' );
+	const [ socialData, setSocialData ] = useState();
 	const [ isValidSocials, setIsValidSocials ] = useState( false );
 	const [ isSocialFormOpen, setIsSocialFormOpen ] = useState( false );
 
@@ -41,16 +41,17 @@ const BasicInfoForm = () => {
 
 	const { currentData } = useSelect( ( select ) => {
 		return {
-			currentData:
-				select( nfdOnboardingStore ).getCurrentOnboardingData(),
+			currentData: select(
+				nfdOnboardingStore
+			).getCurrentOnboardingData(),
 		};
 	}, [] );
 
 	function setDefaultData() {
 		if ( isLoaded ) {
-			setSiteLogo( flowData?.data.siteLogo );
-			setSiteTitle( flowData?.data.blogName );
-			setSiteDesc( flowData?.data.blogDescription );
+			setSiteLogo( flowData?.data?.siteLogo ?? 0);
+			setSiteTitle( flowData?.data?.blogName ?? '');
+			setSiteDesc( flowData?.data?.blogDescription ?? '' );
 		}
 	}
 
@@ -66,10 +67,9 @@ const BasicInfoForm = () => {
 		return dataToSave;
 	}
 
-	useEffect(() => {
-		if(isSocialFormOpen) 
-			socialMediaRef.current.scrollIntoView();
-	}, [isSocialFormOpen]);
+	useEffect( () => {
+		if ( isSocialFormOpen ) socialMediaRef.current.scrollIntoView();
+	}, [ isSocialFormOpen ] );
 
 	useEffect( () => {
 		async function getFlowData() {
@@ -99,7 +99,7 @@ const BasicInfoForm = () => {
 		editEntityRecord( 'root', 'site', undefined, {
 			site_logo: siteLogo?.id ? siteLogo.id : null,
 			description: siteDesc,
-			title: siteTitle
+			title: siteTitle,
 		} );
 	};
 
@@ -129,94 +129,106 @@ const BasicInfoForm = () => {
 	}, [ debouncedFlowData ] );
 
 	return (
-		<div className="basic-info">
-			<div className={ `${ isError ? 'error__show' : 'error__hide' }` }>
-				{ __( content.error.title, 'wp-module-onboarding' ) }
-			</div>
-			<div className="basic-info-form">
-				<div className="basic-info-form__left">
-					<TextInput
-						title={ sprintf(
-							__(
-								content.siteTitle.title,
-								'wp-module-onboarding'
-							),
-							translations( 'Site' )
-						) }
-						hint={ __(
-							content.siteTitle.hint,
-							'wp-module-onboarding'
-						) }
-						placeholder={ sprintf(
-							__(
-								content.siteTitle.placeholder,
+		<Animate
+			type="fade-in"
+			after={
+				typeof flowData === "object" && typeof socialData === "object"
+			}
+		>
+			<div className={ 'basic-info' }>
+				<div
+					className={ `${ isError ? 'error__show' : 'error__hide' }` }
+				>
+					{ __( content.error.title, 'wp-module-onboarding' ) }
+				</div>
+				<div className="basic-info-form">
+					<div className="basic-info-form__left">
+						<TextInput
+							title={ sprintf(
+								__(
+									content.siteTitle.title,
+									'wp-module-onboarding'
+								),
+								translations( 'Site' )
+							) }
+							hint={ __(
+								content.siteTitle.hint,
 								'wp-module-onboarding'
-							),
-							translations( 'Site' )
-						) }
-						maxCharacters={ __(
-							content.siteTitle.maxCharacters,
-							'wp-module-onboarding'
-						) }
-						height="47px"
-						textValue={ siteTitle }
-						textValueSetter={ setSiteTitle }
-					/>
-
-					<TextInput
-						title={ sprintf(
-							__(
-								content.siteDesc.title,
+							) }
+							placeholder={ sprintf(
+								__(
+									content.siteTitle.placeholder,
+									'wp-module-onboarding'
+								),
+								translations( 'Site' )
+							) }
+							maxCharacters={ __(
+								content.siteTitle.maxCharacters,
 								'wp-module-onboarding'
-							),
-							translations( 'Site' )
-						) }
-						hint={ sprintf(
-							__( content.siteDesc.hint, 'wp-module-onboarding' ),
-							translations( 'site' )
-						) }
-						placeholder={ sprintf(
-							__(
-								content.siteDesc.placeholder,
+							) }
+							height="47px"
+							textValue={ siteTitle }
+							textValueSetter={ setSiteTitle }
+						/>
+
+						<TextInput
+							title={ sprintf(
+								__(
+									content.siteDesc.title,
+									'wp-module-onboarding'
+								),
+								translations( 'Site' )
+							) }
+							hint={ sprintf(
+								__(
+									content.siteDesc.hint,
+									'wp-module-onboarding'
+								),
+								translations( 'site' )
+							) }
+							placeholder={ sprintf(
+								__(
+									content.siteDesc.placeholder,
+									'wp-module-onboarding'
+								),
+								translations( 'Site' )
+							) }
+							maxCharacters={ __(
+								content.siteTitle.maxCharacters,
 								'wp-module-onboarding'
-							),
-							translations( 'Site' )
-						) }
-						maxCharacters={ __(
-							content.siteDesc.maxCharacters,
-							'wp-module-onboarding'
-						) }
-						height="100px"
-						textValue={ siteDesc }
-						textValueSetter={ setSiteDesc }
-					/>
-					<div ref={socialMediaRef}>
-						<SocialMediaForm
+							) }
+							height="100px"
+							textValue={ siteDesc }
+							textValueSetter={ setSiteDesc }
+						/>
+						<div ref={ socialMediaRef }>
+							<SocialMediaForm
+								socialData={ socialData }
+								setSocialData={ setSocialData }
+								isSocialFormOpen={ isSocialFormOpen }
+								setIsValidSocials={ setIsValidSocials }
+								setIsSocialFormOpen={ setIsSocialFormOpen }
+							/>
+						</div>
+					</div>
+					<div className="basic-info-form__right">
+						<ImageUploader
+							icon={ siteLogo }
+							iconSetter={ setSiteLogo }
+						/>
+						<MiniPreview
+							icon={ siteLogo }
+							title={ siteTitle }
+							desc={ siteDesc }
 							socialData={ socialData }
-							setSocialData={ setSocialData }
 							isSocialFormOpen={ isSocialFormOpen }
-							setIsValidSocials={ setIsValidSocials }
 							setIsSocialFormOpen={ setIsSocialFormOpen }
 						/>
 					</div>
 				</div>
-				<div className="basic-info-form__right">
-					<ImageUploader
-						icon={ siteLogo }
-						iconSetter={ setSiteLogo }
-					/>
-					<MiniPreview
-						icon={ siteLogo }
-						title={ siteTitle }
-						desc={ siteDesc }
-						socialData={ socialData }
-						isSocialFormOpen={ isSocialFormOpen } 
-						setIsSocialFormOpen={ setIsSocialFormOpen }
-					/>
-				</div>
+				<SkipButton />
 			</div>
-			<SkipButton />
-		</div>
+		</Animate>
 	);
 };