diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 9404ed6ea5..5e8efb0bae 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -331,7 +331,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			$term_count = 0;
 
 			foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {
-				$term_count += count( $tax_query['terms'] );
+				if ( isset( $tax_query['terms'] ) && is_countable( $tax_query['terms'] ) ) {
+					$term_count += count( $tax_query['terms'] );
+				}
 			}
 
 			$obj = $wp_query->get_queried_object();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 141f629705..0edff1c022 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-54782';
+$wp_version = '6.2-alpha-54785';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.