diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
index eb4b7849e2..862a28f768 100644
--- a/wp-includes/class-wp-tax-query.php
+++ b/wp-includes/class-wp-tax-query.php
@@ -637,6 +637,10 @@ class WP_Tax_Query {
 				break;
 		}
 
+		if ( ! is_taxonomy_hierarchical( $query['taxonomy'] ) ) {
+			$args['number'] = count( $terms );
+		}
+
 		$term_query = new WP_Term_Query();
 		$term_list  = $term_query->query( $args );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cea5b3b8af..b271e6f1bc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-53036';
+$wp_version = '6.0-alpha-53037';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.