diff --git a/wp-includes/query.php b/wp-includes/query.php
index 982b92e97a..ad407c1fdd 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -2857,6 +2857,9 @@ class WP_Query {
 						} else {
 							$q['term_id'] = $queried_items['terms'][0];
 						}
+
+						// Take the first one we find.
+						break;
 					}
 				}
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7f74ce07e5..08394b0dec 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36483';
+$wp_version = '4.5-alpha-36484';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.