diff --git a/plugins/woocommerce-admin/client/dashboard/task-list/tasks.js b/plugins/woocommerce-admin/client/dashboard/task-list/tasks.js
index 01df048de2e..fb654aa55f0 100644
--- a/plugins/woocommerce-admin/client/dashboard/task-list/tasks.js
+++ b/plugins/woocommerce-admin/client/dashboard/task-list/tasks.js
@@ -34,7 +34,7 @@ export function getTasks( { profileItems, options, query } ) {
 		shippingZonesCount,
 	} = getSetting( 'onboarding', {
 		customLogo: '',
-		hasHomePage: false,
+		hasHomepage: false,
 		hasPhysicalProducts: false,
 		hasProducts: false,
 		isTaxComplete: false,
diff --git a/plugins/woocommerce-admin/src/Features/OnboardingTasks.php b/plugins/woocommerce-admin/src/Features/OnboardingTasks.php
index 2c68a16149b..321d8c31c69 100644
--- a/plugins/woocommerce-admin/src/Features/OnboardingTasks.php
+++ b/plugins/woocommerce-admin/src/Features/OnboardingTasks.php
@@ -83,7 +83,7 @@ class OnboardingTasks {
 		// task completion along with cache busting for active tasks.
 		$settings['onboarding']['automatedTaxSupportedCountries'] = self::get_automated_tax_supported_countries();
 		$settings['onboarding']['customLogo']                     = get_theme_mod( 'custom_logo', false );
-		$settings['onboarding']['hasHomepage']                    = self::check_task_completion( 'homepage' );
+		$settings['onboarding']['hasHomepage']                    = self::check_task_completion( 'homepage' ) || 'classic' === get_option( 'classic-editor-replace' );
 		$settings['onboarding']['hasPhysicalProducts']            = count(
 			wc_get_products(
 				array(