diff --git a/src/Domain/Services/OnboardingTasks/ReviewCheckoutTask.php b/src/Domain/Services/OnboardingTasks/ReviewCheckoutTask.php
index 8c162a2f2ec..7e513a6eb6f 100644
--- a/src/Domain/Services/OnboardingTasks/ReviewCheckoutTask.php
+++ b/src/Domain/Services/OnboardingTasks/ReviewCheckoutTask.php
@@ -69,7 +69,7 @@ public function is_complete() {
 	 */
 	private function has_cart_block() {
 		$cart_page_id   = wc_get_page_id( 'cart' );
-		$has_block_cart = $cart_page_id && has_block( 'woocommerce/cart', $cart_page_id );
+		$has_block_cart = $cart_page_id && ( has_block( 'woocommerce/cart', $cart_page_id ) || has_block( 'woocommerce/classic-shortcode', $cart_page_id ) );
 
 		return $has_block_cart;
 	}
@@ -81,7 +81,7 @@ private function has_cart_block() {
 	 */
 	private function has_checkout_block() {
 		$cart_page_id   = wc_get_page_id( 'cart' );
-		$has_block_cart = $cart_page_id && has_block( 'woocommerce/cart', $cart_page_id );
+		$has_block_cart = $cart_page_id && ( has_block( 'woocommerce/cart', $cart_page_id ) || has_block( 'woocommerce/classic-shortcode', $cart_page_id ) );
 
 		return $has_block_cart;
 	}