diff --git a/wp-includes/query.php b/wp-includes/query.php
index 135dad69b..a4f6a0dd5 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1829,13 +1829,6 @@ class WP_Query {
 					}
 				}
 			}
-
-			if ( empty($post_type) ) {
-				$post_type = 'any';
-				$post_status_join = true;
-			} elseif ( in_array('attachment', (array) $post_type) ) {
-				$post_status_join = true;
-			}
 		}
 
 		// Category stuff
@@ -1921,6 +1914,13 @@ class WP_Query {
 		if ( !empty( $tax_query ) ) {
 			$this->tax_query = $tax_query;
 
+			if ( empty($post_type) ) {
+				$post_type = 'any';
+				$post_status_join = true;
+			} elseif ( in_array('attachment', (array) $post_type) ) {
+				$post_status_join = true;
+			}
+
 			$where .= " AND $wpdb->posts.ID IN( " . implode( ', ', wp_tax_query( $tax_query ) ) . ")";
 		}