diff --git a/wp-includes/query.php b/wp-includes/query.php
index 7bb6448b6e..96013ad42c 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1398,8 +1398,10 @@ class WP_Query {
 
 			if ( empty($qv['taxonomy']) || empty($qv['term']) ) {
 				$this->is_tax = false;
-				foreach ( $GLOBALS['wp_taxonomies'] as $t ) {
+				foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
 					if ( isset($t->query_var) && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) {
+						$qv['taxonomy'] = $taxonomy;
+						$qv['term'] = $qv[$t->query_var];
 						$this->is_tax = true;
 						break;
 					}