diff --git a/wp-includes/query.php b/wp-includes/query.php
index c90c3ec0d7..309697b15b 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1350,7 +1350,7 @@ class WP_Query extends WP_Object_Query {
 
 			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
 				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( $post_type_obj->has_archive )
+				if ( ! empty( $post_type_obj->has_archive ) )
 					$this->is_post_type_archive = true;
 			}