diff --git a/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md b/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
index 2bc46516047..d36d4781e3c 100644
--- a/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
+++ b/plugins/woocommerce-admin/TESTING-INSTRUCTIONS.md
@@ -64,6 +64,13 @@
 
 1. Install and activate Jetpack
 2. Confirm Jetpack in not show in Free features list
+### Include onboarding settings on the analytic pages #7109
+
+1. Finish the onboarding wizard as usual.
+2. Navigate to one of the analytic pages then refresh the page.
+3. Navigate to WooCommerce -> Home and start OBW again.
+4. Click the continue button.
+5. OBW should continue without an error.
 
 ### Set target to blank for the external links #6999
 
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index 0d384e2429f..97fe7c12d09 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -76,8 +76,17 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 == Unreleased ==
 
 - Fix: WCPay not working in local payments task #7151
-
+- Fix: Include onboarding settings on the analytic pages #7109
 == 2.4.0 6/10/2021 ==
+- Dev: Reduce the specificity and complexity of the ReportError component #6846
+- Add: Create onboarding package to house refactored WCPay card and relevant components #7058
+- Fix: Preventing redundant notices when installing plugins via payments task list. #7026
+- Fix: Autocompleter for custom Search in CompareFilter #6911
+- Fix: Include onboarding settings on the analytic pages #7109
+- Dev: Converting <SettingsForm /> component to TypeScript. #6981
+- Enhancement: Adding Slotfills for remote payments and SettingsForm component. #6932
+- Fix: Make `Search` accept synchronous `autocompleter.options`. #6884
+- Fix: Set autoload to false for all remote inbox notifications options. #7060
 - Add: Consume remote payment methods on frontend #6867
 - Add: Extend payment gateways REST endpoint #6919
 - Add: Add remote payment gateway recommendations initial docs #6962
diff --git a/plugins/woocommerce-admin/src/Features/Onboarding.php b/plugins/woocommerce-admin/src/Features/Onboarding.php
index 383bcf38029..f9ac9f36d1e 100644
--- a/plugins/woocommerce-admin/src/Features/Onboarding.php
+++ b/plugins/woocommerce-admin/src/Features/Onboarding.php
@@ -626,18 +626,17 @@ class Onboarding {
 	}
 
 	/**
-	 * Determine if the current page is home or setup wizard.
+	 * Determine if the current page is one of the WC Admin pages.
 	 *
 	 * @return bool
 	 */
-	protected function is_home_or_setup_wizard_page() {
-		$allowed_paths = array( 'wc-admin', 'wc-admin&path=/setup-wizard' );
-		$current_page  = PageController::get_instance()->get_current_page();
+	protected function is_wc_pages() {
+		$current_page = PageController::get_instance()->get_current_page();
 		if ( ! $current_page || ! isset( $current_page['path'] ) ) {
 			return false;
 		}
 
-		return in_array( $current_page['path'], $allowed_paths, true );
+		return 0 === strpos( $current_page['path'], 'wc-admin' );
 	}
 
 	/**
@@ -658,7 +657,7 @@ class Onboarding {
 		if (
 			( ! self::should_show_profiler() && ! self::should_show_tasks()
 			||
-			! $this->is_home_or_setup_wizard_page()
+			! $this->is_wc_pages()
 		)
 		) {
 			return $settings;