diff --git a/wp-includes/post.php b/wp-includes/post.php
index 94f916ec7..994de88dc 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -381,6 +381,8 @@ function &get_post(&$post, $output = OBJECT, $filter = 'raw') {
 		_get_post_ancestors($post);
 		$_post = sanitize_post($post, 'raw');
 		wp_cache_add($post->ID, $_post, 'posts');
+	} elseif ( is_object($post) && 'raw' == $post->filter ) {
+		$_post = $post;
 	} else {
 		if ( is_object($post) )
 			$post_id = $post->ID;
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 34864b94f..1887a6f0a 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -2745,9 +2745,9 @@ class WP_Query {
 
 		$this->post_count = count($this->posts);
 
-		// Sanitize before caching so it'll only get done once
-		for ( $i = 0; $i < $this->post_count; $i++ ) {
-			$this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
+		// Always sanitize
+		foreach ( $this->posts as $i => $post ) {
+			$this->posts[$i] = sanitize_post( $post, 'raw' );
 		}
 
 		if ( $q['cache_results'] )